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

1 files changed, 15 insertions, 15 deletions

diff --git a/kopete/protocols/sms/services/smsclient.cpp b/kopete/protocols/sms/services/smsclient.cpp
index 05712501..0139b8b3 100644
--- a/kopete/protocols/sms/services/smsclient.cpp
+++ b/kopete/protocols/sms/services/smsclient.cpp
@@ -15,7 +15,7 @@
 */
 
 #include <tqcombobox.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klocale.h>
 #include <kurlrequester.h>
@@ -41,13 +41,13 @@ SMSClient::~SMSClient()
 {
 }
 
-void SMSClient::setWidgetContainer(TQWidget* parent, TQGridLayout* tqlayout)
+void SMSClient::setWidgetContainer(TQWidget* parent, TQGridLayout* layout)
 {
-	kdWarning( 14160 ) << k_funcinfo << "ml: " << tqlayout << ", " << "mp: " << parent << endl;
+	kdWarning( 14160 ) << k_funcinfo << "ml: " << layout << ", " << "mp: " << parent << endl;
 	m_parent = parent;
-	m_layout = tqlayout;
+	m_layout = layout;
 	TQWidget *configWidget = configureWidget(parent);
-	tqlayout->addMultiCellWidget(configWidget, 0, 1, 0, 1);
+	layout->addMultiCellWidget(configWidget, 0, 1, 0, 1);
 	configWidget->show();
 }
 
@@ -59,7 +59,7 @@ void SMSClient::send(const Kopete::Message& msg)
 	m_msg = msg;
 	
 	KConfigGroup* c = m_account->configGroup();
-	TQString provider = c->readEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ProviderName"), TQString());
+	TQString provider = c->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProviderName"), TQString());
 
 	if (provider.isNull())
 	{
@@ -67,7 +67,7 @@ void SMSClient::send(const Kopete::Message& msg)
 		return;
 	}
 
-	TQString programName = c->readEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ProgramName"). TQString());
+	TQString programName = c->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProgramName"). TQString());
 	if (programName.isNull())
 		programName = "/usr/bin/sms_client";
 
@@ -97,14 +97,14 @@ TQWidget* SMSClient::configureWidget(TQWidget* parent)
 	prefWidget->configDir->setMode(KFile::Directory);
 	TQString configDir;
 	if (m_account)
-		configDir = m_account->configGroup()->readEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ConfigDir"), TQString());
+		configDir = m_account->configGroup()->readEntry(TQString("%1:%2").arg("SMSClient").arg("ConfigDir"), TQString());
 	if (configDir.isNull())
 		configDir = "/etc/sms";
 	prefWidget->configDir->setURL(configDir);
 
 	TQString programName;
 	if (m_account)
-		programName = m_account->configGroup()->readEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ProgramName"),
+		programName = m_account->configGroup()->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProgramName"),
 		                                                  TQString());
 	if (programName.isNull())
 		programName = "/usr/bin/sms_client";
@@ -114,7 +114,7 @@ TQWidget* SMSClient::configureWidget(TQWidget* parent)
 
 	if (m_account)
 	{
-		TQString pName = m_account->configGroup()->readEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ProviderName"));
+		TQString pName = m_account->configGroup()->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProviderName"));
 		for (int i=0; i < prefWidget->provider->count(); i++)
 		{
 			if (prefWidget->provider->text(i) == pName)
@@ -136,9 +136,9 @@ void SMSClient::savePreferences()
 	{
 		KConfigGroup* c = m_account->configGroup();
 
-		c->writeEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ProgramName"), prefWidget->program->url());
-		c->writeEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ConfigDir"), prefWidget->configDir->url());
-		c->writeEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ProviderName"), prefWidget->provider->currentText());
+		c->writeEntry(TQString("%1:%2").arg("SMSClient").arg("ProgramName"), prefWidget->program->url());
+		c->writeEntry(TQString("%1:%2").arg("SMSClient").arg("ConfigDir"), prefWidget->configDir->url());
+		c->writeEntry(TQString("%1:%2").arg("SMSClient").arg("ProviderName"), prefWidget->provider->currentText());
 	}
 }
 
@@ -147,7 +147,7 @@ TQStringList SMSClient::providers()
 	TQStringList p;
 
 	TQDir d;
-	d.setPath(TQString("%1/services/").tqarg(prefWidget->configDir->url()));
+	d.setPath(TQString("%1/services/").arg(prefWidget->configDir->url()));
 	p += d.entryList("*", TQDir::Files);
 
 	return p;
@@ -176,7 +176,7 @@ int SMSClient::maxSize()
 const TQString& SMSClient::description()
 {
 	TQString url = "http://www.smsclient.org";
-	m_description = i18n("<qt>SMSClient is a program for sending SMS with the modem. The program can be found on <a href=\"%1\">%1</a></qt>").tqarg(url).tqarg(url);
+	m_description = i18n("<qt>SMSClient is a program for sending SMS with the modem. The program can be found on <a href=\"%1\">%1</a></qt>").arg(url).arg(url);
 	return m_description;
 }