Remove additional unneeded tq method conversions

7 files changed, 25 insertions, 25 deletions

diff --git a/kopete/protocols/sms/serviceloader.cpp b/kopete/protocols/sms/serviceloader.cpp
index b3f497be..0ebbe7fa 100644
--- a/kopete/protocols/sms/serviceloader.cpp
+++ b/kopete/protocols/sms/serviceloader.cpp
@@ -43,7 +43,7 @@ SMSService* ServiceLoader::loadService(const TQString& name, Kopete::Account* ac
 #endif
 	else
 	{
-		KMessageBox::sorry(Kopete::UI::Global::mainWidget(), i18n("Could not load service %1.").tqarg(name),
+		KMessageBox::sorry(Kopete::UI::Global::mainWidget(), i18n("Could not load service %1.").arg(name),
 			i18n("Error Loading Service"));
 		s = 0L;
 	}
diff --git a/kopete/protocols/sms/services/gsmlib.cpp b/kopete/protocols/sms/services/gsmlib.cpp
index 1d4836a1..9e941132 100644
--- a/kopete/protocols/sms/services/gsmlib.cpp
+++ b/kopete/protocols/sms/services/gsmlib.cpp
@@ -308,7 +308,7 @@ void GSMLib::saveConfig()
 	{
 		KConfigGroup* c = m_account->configGroup();
 
-		c->writeEntry(TQString("%1:%2").tqarg("GSMLib").tqarg("Device"), m_device);
+		c->writeEntry(TQString("%1:%2").arg("GSMLib").arg("Device"), m_device);
 	}
 }
 
@@ -320,7 +320,7 @@ void GSMLib::loadConfig()
 		TQString temp;
 		KConfigGroup* c = m_account->configGroup();
 		
-		temp = c->readEntry(TQString("%1:%2").tqarg("GSMLib").tqarg("Device"), TQString());
+		temp = c->readEntry(TQString("%1:%2").arg("GSMLib").arg("Device"), TQString());
 		if( temp != TQString() )
 			m_device = temp;
 	}
@@ -444,7 +444,7 @@ void GSMLib::customEvent(TQCustomEvent* e)
 const TQString& GSMLib::description()
 {
 	TQString url = "http://www.pxh.de/fs/gsmlib/";
-	m_description = i18n("<qt>GSMLib is a library (and utilities) for sending SMS via a GSM device. The program can be found on <a href=\"%1\">%1</a></qt>").tqarg(url).tqarg(url);
+	m_description = i18n("<qt>GSMLib is a library (and utilities) for sending SMS via a GSM device. The program can be found on <a href=\"%1\">%1</a></qt>").arg(url).arg(url);
 	return m_description;
 }
 
diff --git a/kopete/protocols/sms/services/smsclient.cpp b/kopete/protocols/sms/services/smsclient.cpp
index 05712501..0871266c 100644
--- a/kopete/protocols/sms/services/smsclient.cpp
+++ b/kopete/protocols/sms/services/smsclient.cpp
@@ -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;
 }
 
diff --git a/kopete/protocols/sms/services/smssend.cpp b/kopete/protocols/sms/services/smssend.cpp
index 442d7f16..732fc119 100644
--- a/kopete/protocols/sms/services/smssend.cpp
+++ b/kopete/protocols/sms/services/smssend.cpp
@@ -181,7 +181,7 @@ void SMSSend::setOptions(const TQString& name)
 	kdWarning( 14160 ) << k_funcinfo << "m_account = " << m_account << " (should be ok if zero!!)" << endl;
 	if(!prefWidget) return;			// sanity check
 
-	prefWidget->providerLabel->setText(i18n("%1 Settings").tqarg(name));
+	prefWidget->providerLabel->setText(i18n("%1 Settings").arg(name));
 
 	labels.setAutoDelete(true);
 	labels.clear();
@@ -237,7 +237,7 @@ int SMSSend::maxSize()
 const TQString& SMSSend::description()
 {
 	TQString url = "http://zekiller.skytech.org/smssend_en.php";
-	m_description = i18n("<qt>SMSSend is a program for sending SMS through gateways on the web. It can be found on <a href=\"%1\">%2</a></qt>").tqarg(url).tqarg(url);
+	m_description = i18n("<qt>SMSSend is a program for sending SMS through gateways on the web. It can be found on <a href=\"%1\">%2</a></qt>").arg(url).arg(url);
 	return m_description;
 }
 
diff --git a/kopete/protocols/sms/services/smssendprovider.cpp b/kopete/protocols/sms/services/smssendprovider.cpp
index ffd0897e..8feb94a9 100644
--- a/kopete/protocols/sms/services/smssendprovider.cpp
+++ b/kopete/protocols/sms/services/smssendprovider.cpp
@@ -49,7 +49,7 @@ SMSSendProvider::SMSSendProvider(const TQString& providerName, const TQString& p
 	if (f.open(IO_ReadOnly))
 	{
 		TQTextStream t(&f);
-		TQString group = TQString("SMSSend-%1").tqarg(provider);
+		TQString group = TQString("SMSSend-%1").arg(provider);
 		bool exactNumberMatch = false;
 		TQStringList numberWords;
 		numberWords.append("Tel");
@@ -87,7 +87,7 @@ SMSSendProvider::SMSSendProvider(const TQString& providerName, const TQString& p
 
 				descriptions.append(args[1]);
 				if (m_account)
-					values.append(m_account->configGroup()->readEntry(TQString("%1:%2").tqarg(group).tqarg(names[names.count()-1]),
+					values.append(m_account->configGroup()->readEntry(TQString("%1:%2").arg(group).arg(names[names.count()-1]),
 					                                                  TQString()));
 				else
 					values.append("");
@@ -175,7 +175,7 @@ void SMSSendProvider::save(TQPtrList<KLineEdit>& args)
 	kdDebug( 14160 ) << k_funcinfo << "m_account = " << m_account << " (should be non-zero!!)" << endl;
 	if (!m_account) return;		// prevent crash in worst case
 
-	TQString group = TQString("SMSSend-%1").tqarg(provider);
+	TQString group = TQString("SMSSend-%1").arg(provider);
 	int namesI=0;
 
 	for (unsigned i=0; i < args.count(); i++)
@@ -194,7 +194,7 @@ void SMSSendProvider::save(TQPtrList<KLineEdit>& args)
 //                kdDebug(14160) << k_funcinfo << "saving " << args.at(i) << " to " << names[namesI] << endl;
 		if (!args.at(i)->text().isEmpty())
 		{	values[namesI] = args.at(i)->text();
-			m_account->configGroup()->writeEntry(TQString("%1:%2").tqarg(group).tqarg(names[namesI]), values[namesI]);
+			m_account->configGroup()->writeEntry(TQString("%1:%2").arg(group).arg(names[namesI]), values[namesI]);
 		}
 	        namesI++;
 	}
@@ -239,9 +239,9 @@ void SMSSendProvider::send(const Kopete::Message& msg)
 
 	KProcess* p = new KProcess;
 
-	kdWarning( 14160 ) << "Executing " << TQString("%1/bin/smssend").tqarg(prefix) << " \"" << provider << "\" " << values.join("\" \"") << "\"" << endl;
+	kdWarning( 14160 ) << "Executing " << TQString("%1/bin/smssend").arg(prefix) << " \"" << provider << "\" " << values.join("\" \"") << "\"" << endl;
 
-	*p << TQString("%1/bin/smssend").tqarg(prefix) << provider << values;
+	*p << TQString("%1/bin/smssend").arg(prefix) << provider << values;
 
 	output = "";
 	connect( p, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(slotSendFinished(KProcess *)));
diff --git a/kopete/protocols/sms/smsaccount.cpp b/kopete/protocols/sms/smsaccount.cpp
index 1788517d..10e09ae8 100644
--- a/kopete/protocols/sms/smsaccount.cpp
+++ b/kopete/protocols/sms/smsaccount.cpp
@@ -83,7 +83,7 @@ const bool SMSAccount::splitNowMsgTooLong(int msgLength)
 	int max = theService->maxSize();
 	if(theLongMsgAction == ACT_CANCEL) return false;
 	if(theLongMsgAction == ACT_SPLIT) return true;
-	if(KMessageBox::questionYesNo(Kopete::UI::Global::mainWidget(), i18n("This message is longer than the maximum length (%1). Should it be divided to %2 messages?").tqarg(max).tqarg(msgLength / max + 1),
+	if(KMessageBox::questionYesNo(Kopete::UI::Global::mainWidget(), i18n("This message is longer than the maximum length (%1). Should it be divided to %2 messages?").arg(max).arg(msgLength / max + 1),
 		i18n("Message Too Long"), i18n("Divide"), i18n("Do Not Divide")) == KMessageBox::Yes)
 		return true;
 	else
diff --git a/kopete/protocols/sms/ui/smsactprefs.ui b/kopete/protocols/sms/ui/smsactprefs.ui
index f2d5e61b..cd28df83 100644
--- a/kopete/protocols/sms/ui/smsactprefs.ui
+++ b/kopete/protocols/sms/ui/smsactprefs.ui
@@ -187,7 +187,7 @@
                                 <property name="text">
                                     <string>To use SMS, you will need an account with a delivery service.</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>WordBreak|AlignTop</set>
                                 </property>
                             </widget>
@@ -396,7 +396,7 @@
             <property name="text">
                 <string></string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignCenter</set>
             </property>
         </widget>