TQt4 port kdenetwork

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 16 insertions, 16 deletions

diff --git a/kopete/protocols/sms/services/smssend.cpp b/kopete/protocols/sms/services/smssend.cpp
index 2e843dea..8249948a 100644
--- a/kopete/protocols/sms/services/smssend.cpp
+++ b/kopete/protocols/sms/services/smssend.cpp
@@ -50,7 +50,7 @@ SMSSend::~SMSSend()
 void SMSSend::send(const Kopete::Message& msg)
 {
 	kdWarning( 14160 ) << k_funcinfo << "m_account = " << m_account << " (should be non-zero!!)" << endl;
-	TQString provider = m_account->configGroup()->readEntry("SMSSend:ProviderName", TQString::null);
+	TQString provider = m_account->configGroup()->readEntry("SMSSend:ProviderName", TQString());
 
 	if (provider.length() < 1)
 	{
@@ -58,7 +58,7 @@ void SMSSend::send(const Kopete::Message& msg)
 		return;
 	}
 
-	TQString prefix = m_account->configGroup()->readEntry("SMSSend:Prefix", TQString::null);
+	TQString prefix = m_account->configGroup()->readEntry("SMSSend:Prefix", TQString());
 	if (prefix.isNull())
 	{
 		KMessageBox::error(Kopete::UI::Global::mainWidget(), i18n("No prefix set for SMSSend, please change it in the configuration dialog."), i18n("No Prefix"));
@@ -73,23 +73,23 @@ void SMSSend::send(const Kopete::Message& msg)
 	m_provider->send(msg);
 }
 
-void SMSSend::setWidgetContainer(TQWidget* parent, TQGridLayout* layout)
+void SMSSend::setWidgetContainer(TQWidget* tqparent, TQGridLayout* tqlayout)
 {
-	kdWarning( 14160 ) << k_funcinfo << "ml: " << layout << ", " << "mp: " << parent << endl;
-	m_parent = parent;
-	m_layout = layout;
+	kdWarning( 14160 ) << k_funcinfo << "ml: " << tqlayout << ", " << "mp: " << tqparent << endl;
+	m_parent = tqparent;
+	m_layout = tqlayout;
 
 	// could end up being deleted twice??
 	delete prefWidget;
-	prefWidget = new SMSSendPrefsUI(parent);
-	layout->addMultiCellWidget(prefWidget, 0, 1, 0, 1);
+	prefWidget = new SMSSendPrefsUI(tqparent);
+	tqlayout->addMultiCellWidget(prefWidget, 0, 1, 0, 1);
 
 	prefWidget->program->setMode(KFile::Directory);
 
-	TQString prefix = TQString::null;
+	TQString prefix = TQString();
 
 	if (m_account)
-		prefix = m_account->configGroup()->readEntry("SMSSend:Prefix", TQString::null);
+		prefix = m_account->configGroup()->readEntry("SMSSend:Prefix", TQString());
 	if (prefix.isNull())
 	{
 		TQDir d("/usr/share/smssend");
@@ -140,7 +140,7 @@ void SMSSend::loadProviders(const TQString &prefix)
 	TQDir d(prefix + "/share/smssend");
 	if (!d.exists())
 	{
-		setOptions(TQString::null);
+		setOptions(TQString());
 		return;
 	}
 
@@ -160,7 +160,7 @@ void SMSSend::loadProviders(const TQString &prefix)
 
 	bool found = false;
 	if (m_account)
-	{	TQString pName = m_account->configGroup()->readEntry("SMSSend:ProviderName", TQString::null);
+	{	TQString pName = m_account->configGroup()->readEntry("SMSSend:ProviderName", TQString());
 		for (int i=0; i < prefWidget->provider->count(); i++)
 		{
 			if (prefWidget->provider->text(i) == pName)
@@ -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();
@@ -222,10 +222,10 @@ int SMSSend::maxSize()
 {
 	kdWarning( 14160 ) << k_funcinfo << "m_account = " << m_account << " (should be non-zero!!)" << endl;
 
-	TQString pName = m_account->configGroup()->readEntry("SMSSend:ProviderName", TQString::null);
+	TQString pName = m_account->configGroup()->readEntry("SMSSend:ProviderName", TQString());
 	if (pName.length() < 1)
 		return 160;
-	TQString prefix = m_account->configGroup()->readEntry("SMSSend:Prefix", TQString::null);
+	TQString prefix = m_account->configGroup()->readEntry("SMSSend:Prefix", TQString());
 	if (prefix.isNull())
 		prefix = "/usr";
 	// quick sanity check
@@ -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;
 }