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

This reverts commit 1d9c18c8a07f4833695c6a2ab978698ae1cc90e7.

1 files changed, 18 insertions, 18 deletions

diff --git a/src/importcertificatedialog.cpp b/src/importcertificatedialog.cpp
index 3ed4456..e6b0030 100644
--- a/src/importcertificatedialog.cpp
+++ b/src/importcertificatedialog.cpp
@@ -33,7 +33,7 @@
 #include <iostream>
 #include <tqfile.h>
 #include <tqdir.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqcursor.h>
 #include <tqcheckbox.h>
 #include <tqurl.h>
@@ -48,7 +48,7 @@ ImportCertificateDialog::ImportCertificateDialog ( TQWidget *parent, const char*
 {
 	main = new ImportCertificateDialogBase ( this );
 	setMainWidget ( main );
-	main->setMinimumSize ( main->sizeHint() );
+	main->setMinimumSize ( main->tqsizeHint() );
 
 	this->GlobalConfig = GlobalConfig;
 	filename = "";
@@ -490,7 +490,7 @@ void ImportCertificateDialog::accept()
 				processname="openssl";
 
 				if ( GlobalConfig->KvpncDebugLevel >3 )
-					GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2" ).arg("accept()").arg ( i18n ( " import password" ) ),GlobalConfig->debug );
+					GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2" ).tqarg("accept()").arg ( i18n ( " import password" ) ),GlobalConfig->debug );
 
 				if ( main->ImportPasswordEdit->text().isEmpty() )
 					ImportProcess->writeToStdin ( "\n" );
@@ -642,7 +642,7 @@ void ImportCertificateDialog::doCacert()
 {
 	disconnect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doCacert() ) );
 	if ( GlobalConfig->KvpncDebugLevel > 3 )
-		GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).arg("doCacert()"),GlobalConfig->debug );
+		GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).tqarg("doCacert()"),GlobalConfig->debug );
 
 	if ( ImportProcess->normalExit () )
 	{
@@ -695,7 +695,7 @@ void ImportCertificateDialog::doCacert()
 		{
 
 			if ( GlobalConfig->KvpncDebugLevel > 3 )
-				GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2" ).arg("doCacert()").arg ( i18n ( " import password" ) ),GlobalConfig->debug );
+				GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2" ).tqarg("doCacert()").arg ( i18n ( " import password" ) ),GlobalConfig->debug );
 
 			if ( main->ImportPasswordEdit->text().isEmpty() )
 				ImportProcess->writeToStdin ( "\n" );
@@ -766,7 +766,7 @@ void ImportCertificateDialog::doPrivateKey()
 		{
 
 			if ( GlobalConfig->KvpncDebugLevel > 3 )
-				GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2" ).arg("doPrivateKey()").arg ( i18n ( " import password" ) ),GlobalConfig->debug );
+				GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2" ).tqarg("doPrivateKey()").arg ( i18n ( " import password" ) ),GlobalConfig->debug );
 
 // 			if ( main->ImportPasswordEdit->text().isEmpty() )
 // 				ImportProcess->writeToStdin ( "\n" );
@@ -777,14 +777,14 @@ void ImportCertificateDialog::doPrivateKey()
 				if ( main->UsePrivateKeyPasswordCheckBox->isChecked() )
 				{
 					if ( GlobalConfig->KvpncDebugLevel > 3 )
-						GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).arg("doPrivateKey").arg ( i18n ( " private key password" ) ),GlobalConfig->debug );
+						GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).tqarg("doPrivateKey").arg ( i18n ( " private key password" ) ),GlobalConfig->debug );
 
 					ImportProcess->writeToStdin ( main->PrivateKeyPasswordEdit->text() + "\n" );
 				}
 				else
 				{
 					if ( GlobalConfig->KvpncDebugLevel > 3 )
-						GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).arg("doPrivateKey").arg ( i18n ( " private key password dummy" ) ),GlobalConfig->debug );
+						GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).tqarg("doPrivateKey").arg ( i18n ( " private key password dummy" ) ),GlobalConfig->debug );
 
 					// we need 4 chars here
 					ImportProcess->writeToStdin ( "abcd\n" );
@@ -794,14 +794,14 @@ void ImportCertificateDialog::doPrivateKey()
 				if ( main->UsePrivateKeyPasswordCheckBox->isChecked() )
 				{
 					if ( GlobalConfig->KvpncDebugLevel > 3 )
-						GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).arg("doPrivateKey").arg ( i18n ( " private key password" ) ),GlobalConfig->debug );
+						GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).tqarg("doPrivateKey").arg ( i18n ( " private key password" ) ),GlobalConfig->debug );
 
 					ImportProcess->writeToStdin ( main->PrivateKeyPasswordEdit->text() + "\n" );
 				}
 				else
 				{
 					if ( GlobalConfig->KvpncDebugLevel > 3 )
-						GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).arg("doPrivateKey").arg ( i18n ( " private key password dummy" ) ),GlobalConfig->debug );
+						GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).tqarg("doPrivateKey").arg ( i18n ( " private key password dummy" ) ),GlobalConfig->debug );
 
 					// we need 4 chars here
 					ImportProcess->writeToStdin ( "abcd\n" );
@@ -826,7 +826,7 @@ void ImportCertificateDialog::doCreateHash()
 	disconnect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doCreateHash() ) );
 
 	if ( GlobalConfig->KvpncDebugLevel > 3 )
-		GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).arg("doCreateHash()"),GlobalConfig->debug );
+		GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).tqarg("doCreateHash()"),GlobalConfig->debug );
 
 	if ( ImportProcess->normalExit () )
 	{
@@ -866,7 +866,7 @@ void ImportCertificateDialog::doCreateHash()
 		{
 
 			if ( GlobalConfig->KvpncDebugLevel > 3 )
-				GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2" ).arg("doCreateHash()").arg ( i18n ( " import password" ) ),GlobalConfig->debug );
+				GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2" ).tqarg("doCreateHash()").arg ( i18n ( " import password" ) ),GlobalConfig->debug );
 
 			if ( main->ImportPasswordEdit->text().isEmpty() )
 				ImportProcess->writeToStdin ( "\n" );
@@ -894,7 +894,7 @@ void ImportCertificateDialog::doLink()
 {
 	disconnect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doLink() ) );
 	if ( GlobalConfig->KvpncDebugLevel > 3 )
-		GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).arg("doLink()"),GlobalConfig->debug );
+		GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).tqarg("doLink()"),GlobalConfig->debug );
 
 	if ( ImportProcess->normalExit () )
 	{
@@ -957,7 +957,7 @@ void ImportCertificateDialog::doLink()
 void ImportCertificateDialog::exit()
 {
 	if ( GlobalConfig->KvpncDebugLevel > 0 )
-		GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).arg("exit()"),GlobalConfig->debug );
+		GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).tqarg("exit()"),GlobalConfig->debug );
 
 	
 	if ( (ImportProcess != 0L && ImportProcess->normalExit() ) || ImportProcess == 0L )
@@ -1021,14 +1021,14 @@ void ImportCertificateDialog::readFromStdout_import()
 				if ( main->UsePrivateKeyPasswordCheckBox->isChecked() )
 				{
 					if ( GlobalConfig->KvpncDebugLevel > 3 )
-						GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).arg("doPrivateKey").arg ( i18n ( " private key password" ) ),GlobalConfig->debug );
+						GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).tqarg("doPrivateKey").arg ( i18n ( " private key password" ) ),GlobalConfig->debug );
 
 					ImportProcess->writeToStdin ( main->PrivateKeyPasswordEdit->text() + "\n" );
 				}
 				else
 				{
 					if ( GlobalConfig->KvpncDebugLevel > 3 )
-						GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).arg("doPrivateKey").arg ( i18n ( " private key password dummy" ) ),GlobalConfig->debug );
+						GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).tqarg("doPrivateKey").arg ( i18n ( " private key password dummy" ) ),GlobalConfig->debug );
 
 					// we need 4 chars here
 					ImportProcess->writeToStdin ( "abcd\n" );
@@ -1313,7 +1313,7 @@ void ImportCertificateDialog::removePrivateKey()
 {
 	disconnect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( removePrivateKey() ) );
 	if ( GlobalConfig->KvpncDebugLevel > 3 )
-		GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).arg("removePrivateKey()"),GlobalConfig->debug );
+		GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).tqarg("removePrivateKey()"),GlobalConfig->debug );
 
 	if ( ImportProcess->normalExit () )
 	{
@@ -1349,7 +1349,7 @@ void ImportCertificateDialog::removePrivateKey()
 		{
 
 				if ( GlobalConfig->KvpncDebugLevel > 3 )
-					GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).arg("removePrivateKey()").arg ( i18n ( " private key password dummy" ) ),GlobalConfig->debug );
+					GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1: send %2..." ).tqarg("removePrivateKey()").arg ( i18n ( " private key password dummy" ) ),GlobalConfig->debug );
 
 				// we need 4 chars here
 				ImportProcess->writeToStdin ( "abcd\n" );