Rename a number of old tq methods that are no longer tq specific

5 files changed, 35 insertions, 35 deletions

diff --git a/krdc/rdp/krdpview.cpp b/krdc/rdp/krdpview.cpp
index 4e5bc632..14f5cabc 100644
--- a/krdc/rdp/krdpview.cpp
+++ b/krdc/rdp/krdpview.cpp
@@ -120,13 +120,13 @@ KRdpView::~KRdpView()
 // returns the size of the framebuffer
 TQSize KRdpView::framebufferSize()
 {
-	return m_container->tqsizeHint();
+	return m_container->sizeHint();
 }
 
 // returns the suggested size
-TQSize KRdpView::tqsizeHint()
+TQSize KRdpView::sizeHint()
 {
-	return tqmaximumSize();
+	return maximumSize();
 }
 
 // start closing the connection
@@ -164,12 +164,12 @@ bool KRdpView::editPreferences( HostPrefPtr host )
 	int wv = hp->width();
 	int hv = hp->height();
 	int cd = hp->colorDepth();
-	TQString kl = hp->tqlayout();
+	TQString kl = hp->layout();
 	bool kwallet = hp->useKWallet();
 
 	// 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();
@@ -243,7 +243,7 @@ bool KRdpView::start()
 			*m_process << "-g" << (TQString::number(hp->width()) + "x" + TQString::number(hp->height()));
 		}
 	}
-	*m_process << "-k" << hp->tqlayout();
+	*m_process << "-k" << hp->layout();
 	if(!m_user.isEmpty())     { *m_process << "-u" << m_user; }
 
 	if(m_password.isEmpty() && useKWallet ) {
@@ -303,7 +303,7 @@ bool KRdpView::start()
 		return false;
 	}
 
-	settqStatus(REMOTE_VIEW_CONNECTING);
+	setStatus(REMOTE_VIEW_CONNECTING);
 
 	return true;
 }
@@ -340,9 +340,9 @@ void KRdpView::setViewOnly(bool s)
 
 void KRdpView::connectionOpened(WId /*window*/)
 {
-	TQSize size = m_container->tqsizeHint();
+	TQSize size = m_container->sizeHint();
 
-	settqStatus(REMOTE_VIEW_CONNECTED);
+	setStatus(REMOTE_VIEW_CONNECTED);
 	setFixedSize(size);
 	m_container->setFixedSize(size);
 	emit changeSize(size.width(), size.height());
@@ -353,7 +353,7 @@ void KRdpView::connectionOpened(WId /*window*/)
 void KRdpView::connectionClosed()
 {
 	emit disconnected();
-	settqStatus(REMOTE_VIEW_DISCONNECTED);
+	setStatus(REMOTE_VIEW_DISCONNECTED);
 	m_quitFlag = true;
 }
 
@@ -361,7 +361,7 @@ void KRdpView::processDied(KProcess */*proc*/)
 {
 	if(m_status == REMOTE_VIEW_CONNECTING)
 	{
-		settqStatus(REMOTE_VIEW_DISCONNECTED);
+		setStatus(REMOTE_VIEW_DISCONNECTED);
     if(m_clientVersion.isEmpty())
     {
       KMessageBox::error(0, i18n("Connection attempt to host failed."),
diff --git a/krdc/rdp/krdpview.h b/krdc/rdp/krdpview.h
index c34d3c27..7f6180b5 100644
--- a/krdc/rdp/krdpview.h
+++ b/krdc/rdp/krdpview.h
@@ -69,7 +69,7 @@ class KRdpView : public KRemoteView
 
 		// functions regarding the window
 		virtual TQSize framebufferSize();         // returns the size of the remote view
-		TQSize tqsizeHint();                        // returns the suggested size
+		TQSize sizeHint();                        // returns the suggested size
 		virtual bool viewOnly();
 		virtual bool startFullscreen();
 
diff --git a/krdc/rdp/rdphostpref.cpp b/krdc/rdp/rdphostpref.cpp
index 00ce88d7..ba876146 100644
--- a/krdc/rdp/rdphostpref.cpp
+++ b/krdc/rdp/rdphostpref.cpp
@@ -48,7 +48,7 @@ void RdpHostPref::save()
 		m_config->writeEntry(p+"width", m_width);
 		m_config->writeEntry(p+"height", m_height);
 		m_config->writeEntry(p+"colorDepth", m_colorDepth);
-		m_config->writeEntry(p+"tqlayout", m_layout);
+		m_config->writeEntry(p+"layout", m_layout);
 		m_config->writeEntry(p+"askOnConnect", m_askOnConnect);
 		m_config->writeEntry(p+"useKWallet", m_useKWallet);
 	}
@@ -73,7 +73,7 @@ void RdpHostPref::load()
 		m_width = m_config->readNumEntry(p+"width", 0);
 		m_height = m_config->readNumEntry(p+"height", 0);
 		m_colorDepth = m_config->readNumEntry(p+"colorDepth", 24);
-		m_layout = m_config->readEntry(p+"tqlayout", "en-us");
+		m_layout = m_config->readEntry(p+"layout", "en-us");
 		m_askOnConnect = m_config->readBoolEntry(p+"askOnConnect", true);
 		m_useKWallet = m_config->readBoolEntry(p+"useKWallet", true);
 	}
@@ -91,7 +91,7 @@ void RdpHostPref::remove()
 	m_config->deleteEntry(p+"width");
 	m_config->deleteEntry(p+"height");
 	m_config->deleteEntry(p+"colorDepth");
-	m_config->deleteEntry(p+"tqlayout");
+	m_config->deleteEntry(p+"layout");
 	m_config->deleteEntry(p+"askOnConnect");
 	m_config->deleteEntry(p+"useKWallet");
 }
@@ -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)
@@ -154,7 +154,7 @@ void RdpHostPref::setLayout(const TQString &l)
 	save();
 }
 
-TQString RdpHostPref::tqlayout() const
+TQString RdpHostPref::layout() const
 {
 	return m_layout;
 }
diff --git a/krdc/rdp/rdphostpref.h b/krdc/rdp/rdphostpref.h
index 11f490ec..7b7be704 100644
--- a/krdc/rdp/rdphostpref.h
+++ b/krdc/rdp/rdphostpref.h
@@ -60,29 +60,29 @@ static const int rdpDefaultKeymap = 6; // en-us
 
 inline int keymap2int(const TQString &keymap)
 {
-	int tqlayout;
-	for(tqlayout = 0; tqlayout < rdpNumKeymaps; tqlayout++)
+	int layout;
+	for(layout = 0; layout < rdpNumKeymaps; layout++)
 	{
-		if(keymap == rdpKeymaps[tqlayout])
+		if(keymap == rdpKeymaps[layout])
 		{
 			break;
 		}
 	}
-	if(tqlayout == rdpNumKeymaps)
+	if(layout == rdpNumKeymaps)
 	{
-		tqlayout = rdpDefaultKeymap;
+		layout = rdpDefaultKeymap;
 	}
-	return tqlayout;
+	return layout;
 }
 
-inline TQString int2keymap(int tqlayout)
+inline TQString int2keymap(int layout)
 {
-	if(tqlayout < 0 || tqlayout >= rdpNumKeymaps)
+	if(layout < 0 || layout >= rdpNumKeymaps)
 	{
 		return rdpKeymaps[rdpDefaultKeymap];
 	}
 
-	return rdpKeymaps[tqlayout];
+	return rdpKeymaps[layout];
 }
 
 class RdpHostPref : public HostPref
@@ -117,7 +117,7 @@ class RdpHostPref : public HostPref
 		void             setColorDepth(int depth);
 		int              colorDepth() const;
 		void             setLayout(const TQString &l);
-		TQString          tqlayout() const;
+		TQString          layout() const;
 		void             setAskOnConnect(bool ask);
 		bool             askOnConnect() const;
 		bool             useKWallet() const;
diff --git a/krdc/rdp/rdpprefs.ui b/krdc/rdp/rdpprefs.ui
index 0d37422a..338dff73 100644
--- a/krdc/rdp/rdpprefs.ui
+++ b/krdc/rdp/rdpprefs.ui
@@ -40,7 +40,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>70</width>
                             <height>21</height>
@@ -84,7 +84,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>280</width>
                             <height>0</height>
@@ -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">
@@ -325,7 +325,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>280</width>
                             <height>0</height>
@@ -338,7 +338,7 @@
                         <number>4</number>
                     </property>
                     <property name="whatsThis" stdset="0">
-                        <string>Use this to specify your keyboard tqlayout. This tqlayout setting is used to send the correct keyboard codes to the server.</string>
+                        <string>Use this to specify your keyboard layout. This layout setting is used to send the correct keyboard codes to the server.</string>
                     </property>
                 </widget>
                 <widget class="TQLabel" row="3" column="0">
@@ -354,7 +354,7 @@
                         </sizepolicy>
                     </property>
                     <property name="text">
-                        <string>&amp;Keyboard tqlayout:</string>
+                        <string>&amp;Keyboard layout:</string>
                     </property>
                     <property name="buddy" stdset="0">
                         <cstring>cmbKbLayout</cstring>
@@ -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">