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

1 files changed, 28 insertions, 28 deletions

diff --git a/src/importprofiledialog.cpp b/src/importprofiledialog.cpp
index bf5f1f8..f6bdbed 100644
--- a/src/importprofiledialog.cpp
+++ b/src/importprofiledialog.cpp
@@ -30,7 +30,7 @@
 #include <tqfile.h>
 #include <tqurl.h>
 #include <kurl.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqcheckbox.h>
 #include <tqfileinfo.h>
 #include <string>
@@ -57,7 +57,7 @@ ImportProfileDialog::ImportProfileDialog(KVpncConfig *GlobalConfig, TQWidget *pa
 
 	main = new ImportProfileDialogBase(this);
 	setMainWidget(main);
-	main->setMinimumSize(main->tqsizeHint());
+	main->setMinimumSize(main->sizeHint());
 
 	main->FilenameUrlrequester->setFilter( "*.pcf" );
 	main->FilenameUrlrequester->setURL(filename);
@@ -108,7 +108,7 @@ void ImportProfileDialog::canAccept()
 		TQString groups="";
 		 for ( TQStringList::Iterator group = grouplist.begin(); group != grouplist.end(); ++group ) 
 			groups += TQString(" "+*group);
-		GlobalConfig->appendLogEntry(i18n("PCF import: groups found: [ %1 ]").tqarg(groups), GlobalConfig->debug);
+		GlobalConfig->appendLogEntry(i18n("PCF import: groups found: [ %1 ]").arg(groups), GlobalConfig->debug);
 	}
 	
 	config.setGroup( "main" );
@@ -154,12 +154,12 @@ void ImportProfileDialog::canAccept()
 	TQString Description = config.readEntry( "Description", "" );
 	
 	if (Description.isEmpty())
-		Description = config.readEntry("!Description",i18n("Profile imported from file %1.").tqarg(filename));
+		Description = config.readEntry("!Description",i18n("Profile imported from file %1.").arg(filename));
 
 	if (!Description.isEmpty())
 	{
 		if (GlobalConfig->KvpncDebugLevel > 0)
-			GlobalConfig->appendLogEntry(i18n("PCF import: description found: %1").tqarg(Description), GlobalConfig->debug);
+			GlobalConfig->appendLogEntry(i18n("PCF import: description found: %1").arg(Description), GlobalConfig->debug);
 		acc->setDescription( Description );
 	}
 	
@@ -172,7 +172,7 @@ void ImportProfileDialog::canAccept()
 	if (!Gateway.isEmpty())
 	{
 		if (GlobalConfig->KvpncDebugLevel > 0)
-			GlobalConfig->appendLogEntry(i18n("PCF import: gateway found: %1").tqarg(Gateway), GlobalConfig->debug);
+			GlobalConfig->appendLogEntry(i18n("PCF import: gateway found: %1").arg(Gateway), GlobalConfig->debug);
 		acc->setGateway( Gateway );
 	}
 	
@@ -193,7 +193,7 @@ void ImportProfileDialog::canAccept()
 	if (!GroupName.isEmpty())
 	{
 		if (GlobalConfig->KvpncDebugLevel > 0)
-			GlobalConfig->appendLogEntry(i18n("PCF import: group name found: %1").tqarg(GroupName), GlobalConfig->debug);
+			GlobalConfig->appendLogEntry(i18n("PCF import: group name found: %1").arg(GroupName), GlobalConfig->debug);
 		acc->setID( GroupName );
 	}
 	
@@ -204,7 +204,7 @@ void ImportProfileDialog::canAccept()
 	if (!NtDomain.isEmpty())
 	{
 		if (GlobalConfig->KvpncDebugLevel > 0)
-			GlobalConfig->appendLogEntry(i18n("PCF import: NT domain found: %1").tqarg(NtDomain), GlobalConfig->debug);
+			GlobalConfig->appendLogEntry(i18n("PCF import: NT domain found: %1").arg(NtDomain), GlobalConfig->debug);
 		acc->setNtDomainName( NtDomain );
 	}
 	
@@ -217,7 +217,7 @@ void ImportProfileDialog::canAccept()
 	TQString CertName = config.readEntry( "CertName", "" );
 
 	if (GlobalConfig->KvpncDebugLevel > 0)
-		GlobalConfig->appendLogEntry(i18n("PCF import: certificate name found: %1").tqarg(CertName), GlobalConfig->debug);
+		GlobalConfig->appendLogEntry(i18n("PCF import: certificate name found: %1").arg(CertName), GlobalConfig->debug);
 
 	TQString CertPath = config.readEntry( "CertPath", "" );
 	TQString CertSubjectName = config.readEntry( "CertSubjectName", "" );
@@ -234,7 +234,7 @@ void ImportProfileDialog::canAccept()
 	if (CertStore == 1)
 		useCertStore = true;
 	if (GlobalConfig->KvpncDebugLevel > 0)
-		GlobalConfig->appendLogEntry(i18n("PCF import: certificate should be stored into cisco cert store: %1").tqarg(TQString().setNum(int(useCertStore))), GlobalConfig->debug);
+		GlobalConfig->appendLogEntry(i18n("PCF import: certificate should be stored into cisco cert store: %1").arg(TQString().setNum(int(useCertStore))), GlobalConfig->debug);
 	
 	if (useCertStore)
 	{
@@ -328,13 +328,13 @@ void ImportProfileDialog::canAccept()
 	if (useUdp)
 	{
 		if (GlobalConfig->KvpncDebugLevel > 0)
-			GlobalConfig->appendLogEntry(i18n("PCF import: using %1 for tunneling").tqarg("UDP"), GlobalConfig->debug);
+			GlobalConfig->appendLogEntry(i18n("PCF import: using %1 for tunneling").arg("UDP"), GlobalConfig->debug);
 		acc->setUseUdp( true);
 	}
 	else
 	{
 		if (GlobalConfig->KvpncDebugLevel > 0)
-			GlobalConfig->appendLogEntry(i18n("PCF import: using %1 for tunneling").tqarg("TCP"), GlobalConfig->debug);
+			GlobalConfig->appendLogEntry(i18n("PCF import: using %1 for tunneling").arg("TCP"), GlobalConfig->debug);
 		acc->setUseUdp( false);
 	}
 	/*
@@ -345,13 +345,13 @@ void ImportProfileDialog::canAccept()
 	if (enableNAT)
 	{
 		if (GlobalConfig->KvpncDebugLevel > 0)
-			GlobalConfig->appendLogEntry(i18n("PCF import: enable NAT mode: %1").tqarg(i18n("yes")), GlobalConfig->debug);
+			GlobalConfig->appendLogEntry(i18n("PCF import: enable NAT mode: %1").arg(i18n("yes")), GlobalConfig->debug);
 		acc->setUseNat(true);
 	}
 	else
 	{
 		if (GlobalConfig->KvpncDebugLevel > 0)
-			GlobalConfig->appendLogEntry(i18n("PCF import: enable NAT mode: %1").tqarg(i18n("no")), GlobalConfig->debug);
+			GlobalConfig->appendLogEntry(i18n("PCF import: enable NAT mode: %1").arg(i18n("no")), GlobalConfig->debug);
 		acc->setUseNat(false);
 	}
 	
@@ -375,7 +375,7 @@ void ImportProfileDialog::canAccept()
 	if (DHGroup != -1 )
 	{
 		if (GlobalConfig->KvpncDebugLevel > 0)
-			GlobalConfig->appendLogEntry(i18n("PCF import: Diffie Hellman group found: %1").tqarg(TQString().setNum(DHGroup)), GlobalConfig->debug);
+			GlobalConfig->appendLogEntry(i18n("PCF import: Diffie Hellman group found: %1").arg(TQString().setNum(DHGroup)), GlobalConfig->debug);
  		IkeGroup =  "dh" + TQString().setNum( DHGroup ) ;
 		useIkeGroup = true;
 		acc->setIkeGroup( IkeGroup );
@@ -385,7 +385,7 @@ void ImportProfileDialog::canAccept()
 	if (PeerTimeout > -1 )
 	{
 		if (GlobalConfig->KvpncDebugLevel > 0)
-			GlobalConfig->appendLogEntry(i18n("PCF import: peer timeout found: %1").tqarg(TQString().setNum(PeerTimeout)), GlobalConfig->debug);
+			GlobalConfig->appendLogEntry(i18n("PCF import: peer timeout found: %1").arg(TQString().setNum(PeerTimeout)), GlobalConfig->debug);
 		// read minutes but store seconds
 		acc->setPeerTimeout( PeerTimeout*60 );
 	}
@@ -394,7 +394,7 @@ void ImportProfileDialog::canAccept()
 	if (!Username.isEmpty())
 	{
 		if (GlobalConfig->KvpncDebugLevel > 0)
-			GlobalConfig->appendLogEntry(i18n("PCF import: user name  found: %1").tqarg(Username), GlobalConfig->debug);
+			GlobalConfig->appendLogEntry(i18n("PCF import: user name  found: %1").arg(Username), GlobalConfig->debug);
 		acc->setUserName( Username );
 	}
 	
@@ -405,7 +405,7 @@ void ImportProfileDialog::canAccept()
 	if (!UserPassword.isEmpty())
 	{
 		if (GlobalConfig->KvpncDebugLevel > 0)
-			GlobalConfig->appendLogEntry(i18n("PCF import: clear text user password found: %1").tqarg(UserPassword), GlobalConfig->debug);
+			GlobalConfig->appendLogEntry(i18n("PCF import: clear text user password found: %1").arg(UserPassword), GlobalConfig->debug);
 		acc->setUserPassword( UserPassword );
 	}
 
@@ -416,7 +416,7 @@ void ImportProfileDialog::canAccept()
 	if (!enc_UserPassword.isEmpty())
 	{
 		if (GlobalConfig->KvpncDebugLevel > 0)
-			GlobalConfig->appendLogEntry(i18n("PCF import: encrypted user password found: %1").tqarg(enc_UserPassword), GlobalConfig->debug);
+			GlobalConfig->appendLogEntry(i18n("PCF import: encrypted user password found: %1").arg(enc_UserPassword), GlobalConfig->debug);
 	}
 	
 	CiscoPasswdDecoder dec (filename);
@@ -438,15 +438,15 @@ void ImportProfileDialog::canAccept()
 	if (!userpasswd.isEmpty())
 	{
 		if (GlobalConfig->KvpncDebugLevel > 3)
-			GlobalConfig->appendLogEntry(i18n("PCF import: decrypted user password found: %1").tqarg(userpasswd), GlobalConfig->debug);
+			GlobalConfig->appendLogEntry(i18n("PCF import: decrypted user password found: %1").arg(userpasswd), GlobalConfig->debug);
 		acc->setUserPassword( userpasswd );
 	}
 	
 	if (GlobalConfig->KvpncDebugLevel > 0)
 		if (saveUserPassword)
-			GlobalConfig->appendLogEntry(i18n("PCF import: save user pass : %1").tqarg(i18n("yes")), GlobalConfig->debug);
+			GlobalConfig->appendLogEntry(i18n("PCF import: save user pass : %1").arg(i18n("yes")), GlobalConfig->debug);
 		else
-			GlobalConfig->appendLogEntry(i18n("PCF import: save user pass : %1").tqarg(i18n("no")), GlobalConfig->debug);
+			GlobalConfig->appendLogEntry(i18n("PCF import: save user pass : %1").arg(i18n("no")), GlobalConfig->debug);
 	acc->setSaveUserPassword( saveUserPassword );
 
 	bool saveGroupPwd = true;
@@ -457,7 +457,7 @@ void ImportProfileDialog::canAccept()
 	if (!GroupPwd.isEmpty())
 	{
 		if (GlobalConfig->KvpncDebugLevel > 3)
-			GlobalConfig->appendLogEntry(i18n("PCF import: clear text group password found: %1").tqarg(GroupPwd), GlobalConfig->debug);
+			GlobalConfig->appendLogEntry(i18n("PCF import: clear text group password found: %1").arg(GroupPwd), GlobalConfig->debug);
 		acc->setPreSharedKey( GroupPwd );
 	}
 	
@@ -469,7 +469,7 @@ void ImportProfileDialog::canAccept()
 	if (!grouppasswd.isEmpty())
 	{
 		if (GlobalConfig->KvpncDebugLevel > 3)
-			GlobalConfig->appendLogEntry(i18n("PCF import: decrypted group password found: %1").tqarg(grouppasswd), GlobalConfig->debug);
+			GlobalConfig->appendLogEntry(i18n("PCF import: decrypted group password found: %1").arg(grouppasswd), GlobalConfig->debug);
 		acc->setPreSharedKey( grouppasswd );
 	}
 	
@@ -502,13 +502,13 @@ void ImportProfileDialog::canAccept()
 
  	if (GlobalConfig->KvpncDebugLevel > 0)
 		if (AuthType ==1)
-			GlobalConfig->appendLogEntry(i18n("PCF import: authentication type found: %1").tqarg(i18n("PSK")), GlobalConfig->debug);
+			GlobalConfig->appendLogEntry(i18n("PCF import: authentication type found: %1").arg(i18n("PSK")), GlobalConfig->debug);
 		else if (AuthType ==3)
-			GlobalConfig->appendLogEntry(i18n("PCF import: authentication type found: %1").tqarg(i18n("certificate")), GlobalConfig->debug);
+			GlobalConfig->appendLogEntry(i18n("PCF import: authentication type found: %1").arg(i18n("certificate")), GlobalConfig->debug);
 		else if (AuthType ==5)
-			GlobalConfig->appendLogEntry(i18n("PCF import: authentication type found: %1").tqarg(i18n("hybrid")), GlobalConfig->debug);
+			GlobalConfig->appendLogEntry(i18n("PCF import: authentication type found: %1").arg(i18n("hybrid")), GlobalConfig->debug);
 		else
-			GlobalConfig->appendLogEntry(i18n("PCF import: no authentication type found, assuming %1").tqarg(i18n("PSK")), GlobalConfig->debug);
+			GlobalConfig->appendLogEntry(i18n("PCF import: no authentication type found, assuming %1").arg(i18n("PSK")), GlobalConfig->debug);
 
 	if (AuthType == 3 || AuthType == 5)
 	{