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

This reverts commit 808e453c56036211f57482ed847d54aca01bba68.

7 files changed, 42 insertions, 42 deletions

diff --git a/kopete/protocols/sms/services/gsmlib.cpp b/kopete/protocols/sms/services/gsmlib.cpp
index d4acc515..1d4836a1 100644
--- a/kopete/protocols/sms/services/gsmlib.cpp
+++ b/kopete/protocols/sms/services/gsmlib.cpp
@@ -16,7 +16,7 @@
 #ifdef INCLUDE_SMSGSM
 
 #include <tqcombobox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqapplication.h>
 #include <tqevent.h>
 #include <tqmutex.h>
@@ -308,7 +308,7 @@ void GSMLib::saveConfig()
 	{
 		KConfigGroup* c = m_account->configGroup();
 
-		c->writeEntry(TQString("%1:%2").arg("GSMLib").arg("Device"), m_device);
+		c->writeEntry(TQString("%1:%2").tqarg("GSMLib").tqarg("Device"), m_device);
 	}
 }
 
@@ -320,7 +320,7 @@ void GSMLib::loadConfig()
 		TQString temp;
 		KConfigGroup* c = m_account->configGroup();
 		
-		temp = c->readEntry(TQString("%1:%2").arg("GSMLib").arg("Device"), TQString());
+		temp = c->readEntry(TQString("%1:%2").tqarg("GSMLib").tqarg("Device"), TQString());
 		if( temp != TQString() )
 			m_device = temp;
 	}
@@ -348,12 +348,12 @@ void GSMLib::disconnect()
 
 }
 
-void GSMLib::setWidgetContainer(TQWidget* parent, TQGridLayout* layout)
+void GSMLib::setWidgetContainer(TQWidget* parent, TQGridLayout* tqlayout)
 {
 	m_parent = parent;
-	m_layout = layout;
+	m_layout = tqlayout;
 	TQWidget *configWidget = configureWidget(parent);
-	layout->addMultiCellWidget(configWidget, 0, 1, 0, 1);
+	tqlayout->addMultiCellWidget(configWidget, 0, 1, 0, 1);
 	configWidget->show();
 }
 
@@ -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>").arg(url).arg(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>").tqarg(url).tqarg(url);
 	return m_description;
 }
 
diff --git a/kopete/protocols/sms/services/gsmlibprefs.ui b/kopete/protocols/sms/services/gsmlibprefs.ui
index 8cccfe81..b0bcd890 100644
--- a/kopete/protocols/sms/services/gsmlibprefs.ui
+++ b/kopete/protocols/sms/services/gsmlibprefs.ui
@@ -29,7 +29,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>321</width>
                     <height>16</height>
@@ -65,7 +65,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout13</cstring>
+                <cstring>tqlayout13</cstring>
             </property>
             <grid>
                 <property name="name">
diff --git a/kopete/protocols/sms/services/smsclient.cpp b/kopete/protocols/sms/services/smsclient.cpp
index 0139b8b3..05712501 100644
--- a/kopete/protocols/sms/services/smsclient.cpp
+++ b/kopete/protocols/sms/services/smsclient.cpp
@@ -15,7 +15,7 @@
 */
 
 #include <tqcombobox.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <klocale.h>
 #include <kurlrequester.h>
@@ -41,13 +41,13 @@ SMSClient::~SMSClient()
 {
 }
 
-void SMSClient::setWidgetContainer(TQWidget* parent, TQGridLayout* layout)
+void SMSClient::setWidgetContainer(TQWidget* parent, TQGridLayout* tqlayout)
 {
-	kdWarning( 14160 ) << k_funcinfo << "ml: " << layout << ", " << "mp: " << parent << endl;
+	kdWarning( 14160 ) << k_funcinfo << "ml: " << tqlayout << ", " << "mp: " << parent << endl;
 	m_parent = parent;
-	m_layout = layout;
+	m_layout = tqlayout;
 	TQWidget *configWidget = configureWidget(parent);
-	layout->addMultiCellWidget(configWidget, 0, 1, 0, 1);
+	tqlayout->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").arg("SMSClient").arg("ProviderName"), TQString());
+	TQString provider = c->readEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ProviderName"), TQString());
 
 	if (provider.isNull())
 	{
@@ -67,7 +67,7 @@ void SMSClient::send(const Kopete::Message& msg)
 		return;
 	}
 
-	TQString programName = c->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProgramName"). TQString());
+	TQString programName = c->readEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("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").arg("SMSClient").arg("ConfigDir"), TQString());
+		configDir = m_account->configGroup()->readEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("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").arg("SMSClient").arg("ProgramName"),
+		programName = m_account->configGroup()->readEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("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").arg("SMSClient").arg("ProviderName"));
+		TQString pName = m_account->configGroup()->readEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("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").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());
+		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());
 	}
 }
 
@@ -147,7 +147,7 @@ TQStringList SMSClient::providers()
 	TQStringList p;
 
 	TQDir d;
-	d.setPath(TQString("%1/services/").arg(prefWidget->configDir->url()));
+	d.setPath(TQString("%1/services/").tqarg(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>").arg(url).arg(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>").tqarg(url).tqarg(url);
 	return m_description;
 }
 
diff --git a/kopete/protocols/sms/services/smsclientprefs.ui b/kopete/protocols/sms/services/smsclientprefs.ui
index 36e9f543..1b10799a 100644
--- a/kopete/protocols/sms/services/smsclientprefs.ui
+++ b/kopete/protocols/sms/services/smsclientprefs.ui
@@ -29,7 +29,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>321</width>
                     <height>16</height>
@@ -65,7 +65,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout13</cstring>
+                <cstring>tqlayout13</cstring>
             </property>
             <grid>
                 <property name="name">
diff --git a/kopete/protocols/sms/services/smssend.cpp b/kopete/protocols/sms/services/smssend.cpp
index 43e158ed..442d7f16 100644
--- a/kopete/protocols/sms/services/smssend.cpp
+++ b/kopete/protocols/sms/services/smssend.cpp
@@ -16,7 +16,7 @@
 
 #include <tqcombobox.h>
 #include <tqvgroupbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqtooltip.h>
 
@@ -73,16 +73,16 @@ void SMSSend::send(const Kopete::Message& msg)
 	m_provider->send(msg);
 }
 
-void SMSSend::setWidgetContainer(TQWidget* parent, TQGridLayout* layout)
+void SMSSend::setWidgetContainer(TQWidget* parent, TQGridLayout* tqlayout)
 {
-	kdWarning( 14160 ) << k_funcinfo << "ml: " << layout << ", " << "mp: " << parent << endl;
+	kdWarning( 14160 ) << k_funcinfo << "ml: " << tqlayout << ", " << "mp: " << parent << endl;
 	m_parent = parent;
-	m_layout = layout;
+	m_layout = tqlayout;
 
 	// could end up being deleted twice??
 	delete prefWidget;
 	prefWidget = new SMSSendPrefsUI(parent);
-	layout->addMultiCellWidget(prefWidget, 0, 1, 0, 1);
+	tqlayout->addMultiCellWidget(prefWidget, 0, 1, 0, 1);
 
 	prefWidget->program->setMode(KFile::Directory);
 
@@ -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").arg(name));
+	prefWidget->providerLabel->setText(i18n("%1 Settings").tqarg(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>").arg(url).arg(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>").tqarg(url).tqarg(url);
 	return m_description;
 }
 
diff --git a/kopete/protocols/sms/services/smssendprefs.ui b/kopete/protocols/sms/services/smssendprefs.ui
index c902d22d..cdd2220d 100644
--- a/kopete/protocols/sms/services/smssendprefs.ui
+++ b/kopete/protocols/sms/services/smssendprefs.ui
@@ -29,7 +29,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>311</width>
                     <height>16</height>
@@ -65,7 +65,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout12</cstring>
+                <cstring>tqlayout12</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -139,7 +139,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>351</width>
                     <height>16</height>
diff --git a/kopete/protocols/sms/services/smssendprovider.cpp b/kopete/protocols/sms/services/smssendprovider.cpp
index 8feb94a9..ffd0897e 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").arg(provider);
+		TQString group = TQString("SMSSend-%1").tqarg(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").arg(group).arg(names[names.count()-1]),
+					values.append(m_account->configGroup()->readEntry(TQString("%1:%2").tqarg(group).tqarg(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").arg(provider);
+	TQString group = TQString("SMSSend-%1").tqarg(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").arg(group).arg(names[namesI]), values[namesI]);
+			m_account->configGroup()->writeEntry(TQString("%1:%2").tqarg(group).tqarg(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").arg(prefix) << " \"" << provider << "\" " << values.join("\" \"") << "\"" << endl;
+	kdWarning( 14160 ) << "Executing " << TQString("%1/bin/smssend").tqarg(prefix) << " \"" << provider << "\" " << values.join("\" \"") << "\"" << endl;
 
-	*p << TQString("%1/bin/smssend").arg(prefix) << provider << values;
+	*p << TQString("%1/bin/smssend").tqarg(prefix) << provider << values;
 
 	output = "";
 	connect( p, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(slotSendFinished(KProcess *)));