Remove additional unneeded tq method conversions

15 files changed, 28 insertions, 28 deletions

diff --git a/krdc/hostpreferences.cpp b/krdc/hostpreferences.cpp
index 1307bd5f..1c8ec573 100644
--- a/krdc/hostpreferences.cpp
+++ b/krdc/hostpreferences.cpp
@@ -61,7 +61,7 @@ TQString HostPref::prefix() const {
 }
 
 TQString HostPref::prefix(const TQString &host, const TQString &type) {
-	return TQString("PerHost-%1-%2-").tqarg(type).tqarg(host);
+	return TQString("PerHost-%1-%2-").arg(type).arg(host);
 }
 
 
diff --git a/krdc/keycapturewidget.ui b/krdc/keycapturewidget.ui
index f08c9e7a..43af98f4 100644
--- a/krdc/keycapturewidget.ui
+++ b/krdc/keycapturewidget.ui
@@ -26,7 +26,7 @@
             <property name="text">
                 <string>Enter a special key or key combination to send to the remote side:</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
@@ -91,7 +91,7 @@
             <property name="text">
                 <string>This function allows you to send a key combination like Ctrl+Alt+Del to the remote side. Press Esc to cancel.</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
diff --git a/krdc/krdc.cpp b/krdc/krdc.cpp
index 2ace992f..68c2d333 100644
--- a/krdc/krdc.cpp
+++ b/krdc/krdc.cpp
@@ -161,7 +161,7 @@ bool KRDC::start()
 		}
 	}
 
-	setCaption(i18n("%1 - Remote Desktop Connection").tqarg(serverHost));
+	setCaption(i18n("%1 - Remote Desktop Connection").arg(serverHost));
 
 	m_scrollView = new TQScrollView2(this, "remote scrollview");
 	m_scrollView->setFrameStyle(TQFrame::NoFrame);
@@ -340,15 +340,15 @@ bool KRDC::parseHost(TQString &str, Protocol &prot, TQString &serverHost, int &s
 
 	if (url.port()) {
 		if (url.hasUser())
-			str = TQString("%1@%2:%3").tqarg(userName).tqarg(serverHost).tqarg(url.port());
+			str = TQString("%1@%2:%3").arg(userName).arg(serverHost).arg(url.port());
 		else
-			str = TQString("%1:%2").tqarg(serverHost).tqarg(url.port());
+			str = TQString("%1:%2").arg(serverHost).arg(url.port());
 	}
 	else {
 		if (url.hasUser())
-			str = TQString("%1@%2").tqarg(userName).tqarg(serverHost);
+			str = TQString("%1@%2").arg(userName).arg(serverHost);
 		else
-			str = TQString("%1").tqarg(serverHost);
+			str = TQString("%1").arg(serverHost);
 	}
 	return true;
 }
diff --git a/krdc/main.cpp b/krdc/main.cpp
index 95657483..6d80d741 100644
--- a/krdc/main.cpp
+++ b/krdc/main.cpp
@@ -135,7 +135,7 @@ int main(int argc, char *argv[])
 		TQString passwordFile = args->getOption("password-file");
 		TQFile f(passwordFile);
 		if (!f.open(IO_ReadOnly)) {
-			KMessageBox::error(0, i18n("The password file '%1' does not exist.").tqarg(passwordFile));
+			KMessageBox::error(0, i18n("The password file '%1' does not exist.").arg(passwordFile));
 			return 1;
 		}
 		password = TQTextStream(&f).readLine();
@@ -149,7 +149,7 @@ int main(int argc, char *argv[])
 	if (!is.isNull()) {
 		TQRegExp re("([0-9]+)[xX]([0-9]+)");
 		if (!re.exactMatch(is))
-			args->usage(i18n("Wrong tqgeometry format, must be widthXheight"));
+			args->usage(i18n("Wrong geometry format, must be widthXheight"));
 		initialWindowSize = TQSize(re.cap(1).toInt(), re.cap(2).toInt());
 	}
 
diff --git a/krdc/maindialogwidget.cpp b/krdc/maindialogwidget.cpp
index df4d687b..09b0de52 100644
--- a/krdc/maindialogwidget.cpp
+++ b/krdc/maindialogwidget.cpp
@@ -56,7 +56,7 @@ class UrlListViewItem : public KListViewItem
       if ( !desc.isNull() )
         setText( 0, desc );
       if ( ( !userid.isEmpty() ) && ( !fullname.isEmpty() ) )
-        setText( 0, TQString( "%1 (%2)" ).tqarg( fullname ).tqarg( userid ) );
+        setText( 0, TQString( "%1 (%2)" ).arg( fullname ).arg( userid ) );
       else if ( !userid.isNull() )
         setText( 0, userid );
       else if ( !fullname.isNull() )
diff --git a/krdc/rdp/krdpview.cpp b/krdc/rdp/krdpview.cpp
index 672b7b00..b91e42b1 100644
--- a/krdc/rdp/krdpview.cpp
+++ b/krdc/rdp/krdpview.cpp
@@ -169,7 +169,7 @@ bool KRdpView::editPreferences( HostPrefPtr host )
 
 	// show preferences dialog
 	KDialogBase *dlg = new KDialogBase( 0L, "dlg", true,
-		i18n( "RDP Host Preferences for %1" ).tqarg( host->host() ),
+		i18n( "RDP Host Preferences for %1" ).arg( host->host() ),
 		KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true );
 
 	TQVBox *vbox = dlg->makeVBoxMainWidget();
diff --git a/krdc/rdp/rdphostpref.cpp b/krdc/rdp/rdphostpref.cpp
index 00ce88d7..4f677aaf 100644
--- a/krdc/rdp/rdphostpref.cpp
+++ b/krdc/rdp/rdphostpref.cpp
@@ -110,8 +110,8 @@ void RdpHostPref::setDefaults()
 TQString RdpHostPref::prefDescription() const
 {
 	return i18n("Show Preferences: %1, Resolution: %2x%3, Color Depth: %4, Keymap: %5, KWallet: %6")
-	  .tqarg(m_askOnConnect ? i18n("yes") : i18n("no")).tqarg(m_width).tqarg(m_height)
-	  .tqarg(m_colorDepth).tqarg(m_layout).tqarg(m_useKWallet ? i18n("yes") : i18n("no"));
+	  .arg(m_askOnConnect ? i18n("yes") : i18n("no")).arg(m_width).arg(m_height)
+	  .arg(m_colorDepth).arg(m_layout).arg(m_useKWallet ? i18n("yes") : i18n("no"));
 }
 
 void RdpHostPref::setWidth(int w)
diff --git a/krdc/rdp/rdpprefs.ui b/krdc/rdp/rdpprefs.ui
index 46f791a0..e22908c6 100644
--- a/krdc/rdp/rdpprefs.ui
+++ b/krdc/rdp/rdpprefs.ui
@@ -124,7 +124,7 @@
                     <property name="text">
                         <string>H&amp;eight:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -422,7 +422,7 @@
                     <property name="text">
                         <string>&amp;Width:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
diff --git a/krdc/smartptr.h b/krdc/smartptr.h
index 53cbfeea..49fa25c2 100644
--- a/krdc/smartptr.h
+++ b/krdc/smartptr.h
@@ -425,7 +425,7 @@ public:
 			rcrcount = rc->refsToThis;
 		}
 		return TQString("SmartPtr: ptr=%1, refcounts=%2, ptrnum=%3")
-			.tqarg((int)ptr).tqarg(objrcount).tqarg(rcrcount);
+			.arg((int)ptr).arg(objrcount).arg(rcrcount);
 	}
 
 };
diff --git a/krdc/vnc/desktop.c b/krdc/vnc/desktop.c
index 003a7160..73b2e423 100644
--- a/krdc/vnc/desktop.c
+++ b/krdc/vnc/desktop.c
@@ -626,7 +626,7 @@ void SyncScreenRegionX11Thread(int x, int y, int width, int height) {
 }
 
 /*
- * ToplevelInitBeforeRealization sets the title, tqgeometry and other resources
+ * ToplevelInitBeforeRealization sets the title, geometry and other resources
  * on the toplevel window.
  */
 
diff --git a/krdc/vnc/kvncview.cpp b/krdc/vnc/kvncview.cpp
index eabadc7d..a5e42061 100644
--- a/krdc/vnc/kvncview.cpp
+++ b/krdc/vnc/kvncview.cpp
@@ -236,7 +236,7 @@ bool KVncView::editPreferences( HostPrefPtr host )
 
 	// show preferences dialog
 	KDialogBase *dlg = new KDialogBase( 0L, "dlg", true,
-		i18n( "VNC Host Preferences for %1" ).tqarg( host->host() ),
+		i18n( "VNC Host Preferences for %1" ).arg( host->host() ),
 		KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true );
 
 	TQVBox *vbox = dlg->makeVBoxMainWidget();
diff --git a/krdc/vnc/rfbproto.c b/krdc/vnc/rfbproto.c
index 22909533..8424e6ac 100644
--- a/krdc/vnc/rfbproto.c
+++ b/krdc/vnc/rfbproto.c
@@ -734,7 +734,7 @@ static void *MakeSoftCursor(int bpp, int cursorWidth, int cursorHeight,
 
 
 /*********************************************************************
- * HandleCursorShape(). Support for XCursor and RichCursor tqshape
+ * HandleCursorShape(). Support for XCursor and RichCursor shape
  * updates. We emulate cursor operating on the frame buffer (that is
  * why we call it "software cursor").
  ********************************************************************/
diff --git a/krdc/vnc/rfbproto.h b/krdc/vnc/rfbproto.h
index 1b5fd839..f08fe66a 100644
--- a/krdc/vnc/rfbproto.h
+++ b/krdc/vnc/rfbproto.h
@@ -27,7 +27,7 @@
  *
  * All multiple byte integers are in big endian (network) order (most
  * significant byte first).  Unless noted otherwise there is no special
- * tqalignment of protocol structures.
+ * alignment of protocol structures.
  *
  *
  * Once the initial handshaking is done, all messages start with a type byte,
@@ -54,7 +54,7 @@
 /*-----------------------------------------------------------------------------
  * Structure used to specify a rectangle.  This structure is a multiple of 4
  * bytes so that it can be interspersed with 32-bit pixel data without
- * affecting tqalignment.
+ * affecting alignment.
  */
 
 typedef struct {
@@ -299,7 +299,7 @@ typedef struct {
 /*
  * Special encoding numbers:
  *   0xFFFFFF00 .. 0xFFFFFF0F -- encoding-specific compression levels;
- *   0xFFFFFF10 .. 0xFFFFFF1F -- mouse cursor tqshape data;
+ *   0xFFFFFF10 .. 0xFFFFFF1F -- mouse cursor shape data;
  *   0xFFFFFF20 .. 0xFFFFFF2F -- various protocol extensions;
  *   0xFFFFFF30 .. 0xFFFFFFDF -- not allocated yet;
  *   0xFFFFFFE0 .. 0xFFFFFFEF -- quality level for JPEG compressor;
@@ -350,7 +350,7 @@ typedef struct {
  * This message consists of a header giving the number of rectangles of pixel
  * data followed by the rectangles themselves.  The header is padded so that
  * together with the type byte it is an exact multiple of 4 bytes (to help
- * with tqalignment of 32-bit pixels):
+ * with alignment of 32-bit pixels):
  */
 
 typedef struct {
@@ -633,7 +633,7 @@ typedef struct {
 
 /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  * XCursor encoding. This is a special encoding used to transmit X-style
- * cursor tqshapes from server to clients. Note that for this encoding,
+ * cursor shapes from server to clients. Note that for this encoding,
  * coordinates in rfbFramebufferUpdateRectHeader structure hold hotspot
  * position (r.x, r.y) and cursor size (r.w, r.h). If (w * h != 0), two RGB
  * samples are sent after header in the rfbXCursorColors structure. They
@@ -664,7 +664,7 @@ typedef struct {
 
 /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  * RichCursor encoding. This is a special encoding used to transmit cursor
- * tqshapes from server to clients. It is similar to the XCursor encoding but
+ * shapes from server to clients. It is similar to the XCursor encoding but
  * uses client pixel format instead of two RGB colors to represent cursor
  * image. For this encoding, coordinates in rfbFramebufferUpdateRectHeader
  * structure hold hotspot position (r.x, r.y) and cursor size (r.w, r.h).
diff --git a/krdc/vnc/threads.cpp b/krdc/vnc/threads.cpp
index ebd02c8e..097e1367 100644
--- a/krdc/vnc/threads.cpp
+++ b/krdc/vnc/threads.cpp
@@ -185,7 +185,7 @@ bool WriterThread::sendIncrementalUpdateRequest() {
 }
 
 bool WriterThread::sendUpdateRequest(const TQRegion &region) {
-	TQMemArray<TQRect> r = region.tqrects();
+	TQMemArray<TQRect> r = region.rects();
 	for (unsigned int i = 0; i < r.size(); i++)
 		if (!SendFramebufferUpdateRequest(r[i].x(),
 						  r[i].y(),
diff --git a/krdc/vnc/vnchostpref.cpp b/krdc/vnc/vnchostpref.cpp
index 3ae6ed92..7fea2889 100644
--- a/krdc/vnc/vnchostpref.cpp
+++ b/krdc/vnc/vnchostpref.cpp
@@ -96,7 +96,7 @@ TQString VncHostPref::prefDescription() const {
 		Q_ASSERT(true);
 	}
 	return i18n("Show Preferences: %1, Quality: %2, KWallet: %3")
-	  .tqarg(m_askOnConnect ? i18n("yes") : i18n("no")).tqarg(q).tqarg(m_useKWallet ? i18n("yes") : i18n("no"));
+	  .arg(m_askOnConnect ? i18n("yes") : i18n("no")).arg(q).arg(m_useKWallet ? i18n("yes") : i18n("no"));
 }
 
 void VncHostPref::setQuality(int q) {