Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

9 files changed, 21 insertions, 21 deletions

diff --git a/krfb/kcm_krfb/configurationwidget.ui b/krfb/kcm_krfb/configurationwidget.ui
index c49101fa..7eaf2d96 100644
--- a/krfb/kcm_krfb/configurationwidget.ui
+++ b/krfb/kcm_krfb/configurationwidget.ui
@@ -188,7 +188,7 @@
                                 <property name="frameShadow">
                                     <enum>Plain</enum>
                                 </property>
-                                <property name="tqlayoutMargin" stdset="0">
+                                <property name="layoutMargin" stdset="0">
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -495,7 +495,7 @@ Most VNC clients use a display number instead of the actual port. This display n
     <tabstop>passwordInput</tabstop>
     <tabstop>portInput</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/krfb/krfb/configuration.cc b/krfb/krfb/configuration.cc
index 1547141d..2076c4ed 100644
--- a/krfb/krfb/configuration.cc
+++ b/krfb/krfb/configuration.cc
@@ -181,7 +181,7 @@ void Configuration::loadFromKConfig() {
 	for (int i = 0; i < num; i++)
 		invitationList.push_back(Invitation(&c, i));
 
-	tqinvalidateOldInvitations();
+	invalidateOldInvitations();
 	if (invNum != invitationList.size())
 		emit invitationNumChanged(invitationList.size());
 
@@ -212,7 +212,7 @@ void Configuration::saveToKConfig() {
 }
 
 void Configuration::saveToDialogs() {
-	tqinvalidateOldInvitations();
+	invalidateOldInvitations();
 	TQValueList<Invitation>::iterator it = invitationList.begin();
 	while (it != invitationList.end()) {
 		Invitation &inv = *(it++);
@@ -241,7 +241,7 @@ Invitation Configuration::createInvitation() {
 	return inv;
 }
 
-void Configuration::tqinvalidateOldInvitations() {
+void Configuration::invalidateOldInvitations() {
 	TQValueList<Invitation>::iterator it = invitationList.begin();
 	while (it != invitationList.end()) {
 		if (!(*it).isValid())
diff --git a/krfb/krfb/configuration.h b/krfb/krfb/configuration.h
index dd8f5fb7..fb9a1b31 100644
--- a/krfb/krfb/configuration.h
+++ b/krfb/krfb/configuration.h
@@ -97,7 +97,7 @@ private:
         void saveToDialogs();
 	Invitation createInvitation();
 	void closeInvDlg();
-	void tqinvalidateOldInvitations();
+	void invalidateOldInvitations();
 	void setKInetdEnabled(const TQDateTime &date);
 	void setKInetdEnabled(bool enabled);
 	void setKInetdServiceRegistrationEnabled(bool enabled);
diff --git a/krfb/krfb/connectionwidget.ui b/krfb/krfb/connectionwidget.ui
index 93cb3a4e..a4a27b02 100644
--- a/krfb/krfb/connectionwidget.ui
+++ b/krfb/krfb/connectionwidget.ui
@@ -204,5 +204,5 @@
         </spacer>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/krfb/krfb/invitewidget.ui b/krfb/krfb/invitewidget.ui
index 9a137d31..46f39fec 100644
--- a/krfb/krfb/invitewidget.ui
+++ b/krfb/krfb/invitewidget.ui
@@ -192,6 +192,6 @@
     <signal>emailInviteClicked()</signal>
     <signal>manageInviteClicked()</signal>
 </Q_SIGNALS>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/krfb/krfb/manageinvitations.ui b/krfb/krfb/manageinvitations.ui
index a9338792..807ce195 100644
--- a/krfb/krfb/manageinvitations.ui
+++ b/krfb/krfb/manageinvitations.ui
@@ -209,7 +209,7 @@
     <slot>listSizeChanged( int i )</slot>
     <slot>listSelectionChanged()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
 </includehints>
diff --git a/krfb/krfb/personalinvitewidget.ui b/krfb/krfb/personalinvitewidget.ui
index 04e970b5..da8ce9d9 100644
--- a/krfb/krfb/personalinvitewidget.ui
+++ b/krfb/krfb/personalinvitewidget.ui
@@ -236,6 +236,6 @@ Give the information below to the person that you want to invite (&lt;a href="wh
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/krfb/libvncserver/cursor.c b/krfb/libvncserver/cursor.c
index d943dc37..633cc0fe 100644
--- a/krfb/libvncserver/cursor.c
+++ b/krfb/libvncserver/cursor.c
@@ -36,7 +36,7 @@ rfbSendtqCursorShape(cl)
     rfbFramebufferUpdateRectHeader rect;
     rfbXCursorColors colors;
     int saved_ublen;
-    int bitmapRowBytes, tqmaskBytes, dataBytes;
+    int bitmapRowBytes, maskBytes, dataBytes;
     int i, j;
     CARD8 *bitmapData;
     CARD8 bitmapByte;
@@ -85,21 +85,21 @@ rfbSendtqCursorShape(cl)
     /* Calculate data sizes. */
 
     bitmapRowBytes = (pCursor->width + 7) / 8;
-    tqmaskBytes = bitmapRowBytes * pCursor->height;
+    maskBytes = bitmapRowBytes * pCursor->height;
     dataBytes = (cl->useRichCursorEncoding) ?
 	(pCursor->width * pCursor->height *
-	 (cl->format.bitsPerPixel / 8)) : tqmaskBytes;
+	 (cl->format.bitsPerPixel / 8)) : maskBytes;
 
     /* Send buffer contents if needed. */
 
     if ( cl->ublen + sz_rfbFramebufferUpdateRectHeader +
-	 sz_rfbXCursorColors + tqmaskBytes + dataBytes > UPDATE_BUF_SIZE ) {
+	 sz_rfbXCursorColors + maskBytes + dataBytes > UPDATE_BUF_SIZE ) {
 	if (!rfbSendUpdateBuf(cl))
 	    return FALSE;
     }
 
     if ( cl->ublen + sz_rfbFramebufferUpdateRectHeader +
-	 sz_rfbXCursorColors + tqmaskBytes + dataBytes > UPDATE_BUF_SIZE ) {
+	 sz_rfbXCursorColors + maskBytes + dataBytes > UPDATE_BUF_SIZE ) {
 	return FALSE;		/* FIXME. */
     }
 
@@ -347,7 +347,7 @@ void rfbConvertLSBCursorBitmapOrMask(int width,int height,unsigned char* bitmap)
 
 /* Cursor creation. You "paint" a cursor and let these routines do the work */
 
-rfbCursorPtr rfbMakeXCursor(int width,int height,char* cursorString,char* tqmaskString)
+rfbCursorPtr rfbMakeXCursor(int width,int height,char* cursorString,char* maskString)
 {
    int i,j,w=(width+7)/8;
    rfbCursorPtr cursor = (rfbCursorPtr)calloc(1,sizeof(rfbCursor));
@@ -364,9 +364,9 @@ rfbCursorPtr rfbMakeXCursor(int width,int height,char* cursorString,char* tqmask
       for(i=0,bit=0x80;i<width;i++,bit=(bit&1)?0x80:bit>>1,cp++)
 	if(*cp!=' ') cursor->source[j*w+i/8]|=bit;
 
-   if(tqmaskString) {
+   if(maskString) {
       cursor->tqmask = (unsigned char*)calloc(w,height);
-      for(j=0,cp=tqmaskString;j<height;j++)
+      for(j=0,cp=maskString;j<height;j++)
 	for(i=0,bit=0x80;i<width;i++,bit=(bit&1)?0x80:bit>>1,cp++)
 	  if(*cp!=' ') cursor->tqmask[j*w+i/8]|=bit;
    } else
diff --git a/krfb/libvncserver/rfb.h b/krfb/libvncserver/rfb.h
index aba56cfa..55051819 100644
--- a/krfb/libvncserver/rfb.h
+++ b/krfb/libvncserver/rfb.h
@@ -744,7 +744,7 @@ extern Bool rfbSendtqCursorShape(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);
-extern rfbCursorPtr rfbMakeXCursor(int width,int height,char* cursorString,char* tqmaskString);
+extern rfbCursorPtr rfbMakeXCursor(int width,int height,char* cursorString,char* maskString);
 extern char* rfbMakeMaskForXCursor(int width,int height,char* cursorString);
 extern void MakeXCursorFromRichCursor(rfbScreenInfoPtr rfbScreen,rfbCursorPtr cursor);
 extern void MakeRichCursorFromXCursor(rfbScreenInfoPtr rfbScreen,rfbCursorPtr cursor);