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

This reverts commit 1d9c18c8a07f4833695c6a2ab978698ae1cc90e7.

1 files changed, 15 insertions, 15 deletions

diff --git a/src/importopenvpnprofiledialog.cpp b/src/importopenvpnprofiledialog.cpp
index 54980c5..61ed32e 100644
--- a/src/importopenvpnprofiledialog.cpp
+++ b/src/importopenvpnprofiledialog.cpp
@@ -36,7 +36,7 @@
 #include <tqfile.h>
 #include <tqurl.h>
 #include <kurl.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqcheckbox.h>
 #include <string>
 #include <tqprocess.h>
@@ -63,7 +63,7 @@ ImportOpenvpnProfileDialog::ImportOpenvpnProfileDialog ( KVpncConfig *config, TQ
 
 	main = new ImportOpenvpnProfileDialogBase ( this );
 	setMainWidget ( main );
-	//main->setMinimumSize(main->sizeHint());
+	//main->setMinimumSize(main->tqsizeHint());
 
 	main->FilenameUrlrequester->setFilter ( "*.ovpn *.conf" );
 
@@ -761,7 +761,7 @@ void ImportOpenvpnProfileDialog::canAccept()
 					{
 						acc->setAuthenticationDirection(tlsauthdirection);
 						if ( config->KvpncDebugLevel > 0 )
-							config->appendLogEntry ( i18n ( "OpenVPN import: use TLS auth direction: %1" ).arg(tlsauthdirection), config->debug );
+							config->appendLogEntry ( i18n ( "OpenVPN import: use TLS auth direction: %1" ).tqarg(tlsauthdirection), config->debug );
 					}
 				}
 				else if ( line.startsWith ( "redirect-gateway" ) )
@@ -965,7 +965,7 @@ void ImportOpenvpnProfileDialog::canAccept()
 // 			TQTextStream CaCertDstStream( &CaCertFileDst );
 //
 // 			if ( config->KvpncDebugLevel > 1 )
-// 				config->appendLogEntry( i18n( "OpenVPN import: try to copy ca cert file %1 to %2." ).arg( CaCertFileSrc.name() ).arg( CaCertFileDst.name() ), config->debug );
+// 				config->appendLogEntry( i18n( "OpenVPN import: try to copy ca cert file %1 to %2." ).tqarg( CaCertFileSrc.name() ).tqarg( CaCertFileDst.name() ), config->debug );
 //
 //
 // 			if ( CaCertFileSrc.open( IO_ReadOnly ) ) {
@@ -974,17 +974,17 @@ void ImportOpenvpnProfileDialog::canAccept()
 // 					CaCertDstStream << CaCertFileString;
 // 					CaCertFileDst.close();
 // 					if ( config->KvpncDebugLevel > 1 )
-// 						config->appendLogEntry( i18n( "OpenVPN import: ca cert file %1 copied to %2." ).arg( CaCertFileSrc.name() ).arg( CaCertFileDst.name() ), config->debug );
+// 						config->appendLogEntry( i18n( "OpenVPN import: ca cert file %1 copied to %2." ).tqarg( CaCertFileSrc.name() ).tqarg( CaCertFileDst.name() ), config->debug );
 // 				} else {
 // 					if ( config->KvpncDebugLevel > 2 )
-// 						config->appendLogEntry( i18n( "OpenVPN import: ca cert file %1 could not open for writing." ).arg( CaCertFileDst.name() ), config->debug );
+// 						config->appendLogEntry( i18n( "OpenVPN import: ca cert file %1 could not open for writing." ).tqarg( CaCertFileDst.name() ), config->debug );
 //
 // 					//								return;
 // 				}
 // 				CaCertFileDst.close();
 // 			} else {
 // 				if ( config->KvpncDebugLevel > 2 )
-// 					config->appendLogEntry( i18n( "OpenVPN import: ca cert file %1 could not open for reading." ).arg( CaCertFileSrc.name() ), config->debug );
+// 					config->appendLogEntry( i18n( "OpenVPN import: ca cert file %1 could not open for reading." ).tqarg( CaCertFileSrc.name() ), config->debug );
 //
 // 				//							return;
 // 			}
@@ -1001,7 +1001,7 @@ void ImportOpenvpnProfileDialog::canAccept()
 // 			TQTextStream X509CertDstStream( &X509CertFileDst );
 //
 // 			if ( config->KvpncDebugLevel > 1 )
-// 				config->appendLogEntry( i18n( "OpenVPN import: try to copy pre shared key file %1 to %2." ).arg( X509CertFileSrc.name() ).arg( X509CertFileDst.name() ), config->debug );
+// 				config->appendLogEntry( i18n( "OpenVPN import: try to copy pre shared key file %1 to %2." ).tqarg( X509CertFileSrc.name() ).tqarg( X509CertFileDst.name() ), config->debug );
 //
 //
 // 			if ( X509CertFileSrc.open( IO_ReadOnly ) ) {
@@ -1010,17 +1010,17 @@ void ImportOpenvpnProfileDialog::canAccept()
 // 					X509CertDstStream << X509CertFileString;
 // 					X509CertFileDst.close();
 // 					if ( config->KvpncDebugLevel > 2 )
-// 						config->appendLogEntry( i18n( "OpenVPN import: X509 cert file %1 copied to %2." ).arg( X509CertFileSrc.name() ).arg( X509CertFileDst.name() ), config->debug );
+// 						config->appendLogEntry( i18n( "OpenVPN import: X509 cert file %1 copied to %2." ).tqarg( X509CertFileSrc.name() ).tqarg( X509CertFileDst.name() ), config->debug );
 // 				} else {
 // 					if ( config->KvpncDebugLevel > 2 )
-// 						config->appendLogEntry( i18n( "OpenVPN import: X509 cert file %1 could not open for writing." ).arg( X509CertFileDst.name() ), config->debug );
+// 						config->appendLogEntry( i18n( "OpenVPN import: X509 cert file %1 could not open for writing." ).tqarg( X509CertFileDst.name() ), config->debug );
 //
 // 					//								return;
 // 				}
 // 				X509CertFileDst.close();
 // 			} else {
 // 				if ( config->KvpncDebugLevel > 2 )
-// 					config->appendLogEntry( i18n( "OpenVPN import: X509 cert file %1 could not open for reading." ).arg( X509CertFileSrc.name() ), config->debug );
+// 					config->appendLogEntry( i18n( "OpenVPN import: X509 cert file %1 could not open for reading." ).tqarg( X509CertFileSrc.name() ), config->debug );
 //
 // 				//							return;
 // 			}
@@ -1037,7 +1037,7 @@ void ImportOpenvpnProfileDialog::canAccept()
 // 			TQTextStream PreSharedKeyDstStream( &PreSharedKeyFileDst );
 //
 // 			if ( config->KvpncDebugLevel > 1 )
-// 				config->appendLogEntry( i18n( "OpenVPN import: try to copy pre shared key file %1 to %2." ).arg( PreSharedKeyFileSrc.name() ).arg( PreSharedKeyFileDst.name() ), config->debug );
+// 				config->appendLogEntry( i18n( "OpenVPN import: try to copy pre shared key file %1 to %2." ).tqarg( PreSharedKeyFileSrc.name() ).tqarg( PreSharedKeyFileDst.name() ), config->debug );
 //
 // 			if ( PreSharedKeyFileSrc.open( IO_ReadOnly ) ) {
 // 				if ( PreSharedKeyFileDst.open( IO_WriteOnly ) ) {
@@ -1045,17 +1045,17 @@ void ImportOpenvpnProfileDialog::canAccept()
 // 					PreSharedKeyDstStream << PreSharedKeyFileString;
 // 					PreSharedKeyFileDst.close();
 // 					if ( config->KvpncDebugLevel > 2 )
-// 						config->appendLogEntry( i18n( "OpenVPN import: pre shared key file %1 copied to %2." ).arg( PreSharedKeyFileSrc.name() ).arg( PreSharedKeyFileDst.name() ), config->debug );
+// 						config->appendLogEntry( i18n( "OpenVPN import: pre shared key file %1 copied to %2." ).tqarg( PreSharedKeyFileSrc.name() ).tqarg( PreSharedKeyFileDst.name() ), config->debug );
 // 				} else {
 // 					if ( config->KvpncDebugLevel > 2 )
-// 						config->appendLogEntry( i18n( "OpenVPN import: pre shared key file %1 could not open for writing." ).arg( PreSharedKeyFileDst.name() ), config->debug );
+// 						config->appendLogEntry( i18n( "OpenVPN import: pre shared key file %1 could not open for writing." ).tqarg( PreSharedKeyFileDst.name() ), config->debug );
 //
 // 					//								return;
 // 				}
 // 				PreSharedKeyFileDst.close();
 // 			} else {
 // 				if ( config->KvpncDebugLevel > 2 )
-// 					config->appendLogEntry( i18n( "OpenVPN import: pre shared key file %1 could not open for reading." ).arg( PreSharedKeyFileSrc.name() ), config->debug );
+// 					config->appendLogEntry( i18n( "OpenVPN import: pre shared key file %1 could not open for reading." ).tqarg( PreSharedKeyFileSrc.name() ), config->debug );
 //
 // 				//							return;
 // 			}