summaryrefslogtreecommitdiffstats
path: root/src/utils.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:57:26 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:57:26 -0600
commit392b293dfeaa3e4241e50b833126d0c2d598761d (patch)
tree2e113362b942a9339c055661efd21cdb626e5e1d /src/utils.cpp
parent1d9c18c8a07f4833695c6a2ab978698ae1cc90e7 (diff)
downloadkvpnc-392b293dfeaa3e4241e50b833126d0c2d598761d.tar.gz
kvpnc-392b293dfeaa3e4241e50b833126d0c2d598761d.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 1d9c18c8a07f4833695c6a2ab978698ae1cc90e7.
Diffstat (limited to 'src/utils.cpp')
-rw-r--r--src/utils.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/utils.cpp b/src/utils.cpp
index b457bd3..48e58ae 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -289,7 +289,7 @@ bool Utils::unloadKernelModule( TQString Name, TQApplication *app , bool force)
bool Utils::doChmod( TQString file, TQString mode )
{
- config->appendLogEntry ( i18n( "\"%1\" begin." ).arg("chmod"),config->info );
+ config->appendLogEntry ( i18n( "\"%1\" begin." ).tqarg("chmod"),config->info );
KProcess *chmodProcess = new KProcess;
*chmodProcess << "/bin/chmod";
*chmodProcess << mode;
@@ -297,27 +297,27 @@ bool Utils::doChmod( TQString file, TQString mode )
if ( !chmodProcess->start() )
{
- // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).arg( "PppdUpScript" ) );
- config->appendLogEntry( i18n( "Chmod of %1 failed!" ).arg( file ), config->error );
+ // KMessageBox::sorry( this, i18n( "\"%1\" start failed!" ).tqarg( "PppdUpScript" ) );
+ config->appendLogEntry( i18n( "Chmod of %1 failed!" ).tqarg( file ), config->error );
delete chmodProcess;
return false;
}
else
{
if ( config->KvpncDebugLevel > 0 )
- config->appendLogEntry ( i18n( "chmod of %1 (%2) started." ).arg( file ).arg( mode ) , config->debug );
+ config->appendLogEntry ( i18n( "chmod of %1 (%2) started." ).tqarg( file ).tqarg( mode ) , config->debug );
int max_count = 9;
int count=0;
while ( count < max_count && chmodProcess->isRunning() )
{
if ( config->KvpncDebugLevel > 6 )
- config->appendLogEntry ( i18n( "chmod of %1 (%2) running." ).arg( file ).arg( mode ) , config->debug );
+ config->appendLogEntry ( i18n( "chmod of %1 (%2) running." ).tqarg( file ).tqarg( mode ) , config->debug );
usleep ( 250 );
if ( config->appPointer->hasPendingEvents () )
config->appPointer->processEvents();
count++;
}
- config->appendLogEntry ( i18n( "\"%1\" finished." ).arg("chmod"),config->info );
+ config->appendLogEntry ( i18n( "\"%1\" finished." ).tqarg("chmod"),config->info );
delete chmodProcess;
return true;
}
@@ -1010,7 +1010,7 @@ Utils::IpsecAlgos Utils::getKernelCrypto()
}
else
{
- config->appendLogEntry(i18n("%1 cant be opened!").arg("/proc/crypto"),config->error);
+ config->appendLogEntry(i18n("%1 cant be opened!").tqarg("/proc/crypto"),config->error);
}
return salgos;
}
@@ -1216,7 +1216,7 @@ TQStringList Utils::getCertsFromCiscoCertStore(TQString type)
type="user";
if (config->KvpncDebugLevel > 2)
- config->appendLogEntry("getCertsFromCiscoCertStore: "+i18n("type: %1").arg(type),config->debug );
+ config->appendLogEntry("getCertsFromCiscoCertStore: "+i18n("type: %1").tqarg(type),config->debug );
CertsFromCiscoCertStore.clear();
CertsFromCiscoCertPos=0;
@@ -1581,13 +1581,13 @@ void Utils::readPppdtestProcessOutput()
pppdcap.pppdHasReplacedefaultrouteSupport = false;
if (config->KvpncDebugLevel > 1)
- config->appendLogEntry(i18n("Testing %1: %2").arg("replacedefaultroute").arg(i18n("failed")),config->debug);
+ config->appendLogEntry(i18n("Testing %1: %2").tqarg("replacedefaultroute").tqarg(i18n("failed")),config->debug);
}
else
{
pppdcap.pppdHasReplacedefaultrouteSupport = true;
if (config->KvpncDebugLevel > 1)
- config->appendLogEntry(i18n("Testing %1: %2").arg("replacedefaultroute").arg(i18n("succeded")),config->debug);
+ config->appendLogEntry(i18n("Testing %1: %2").tqarg("replacedefaultroute").tqarg(i18n("succeded")),config->debug);
}
}
@@ -1663,7 +1663,7 @@ void Utils::readOutGetEmailAddressOfCert()
void Utils::readOutGetSmartcardSlots(KProcess * proc, char * buffer, int buflen)
{
- TQString msg_raw = TQString::fromLatin1(buffer, buflen);
+ TQString msg_raw = TQString::tqfromLatin1(buffer, buflen);
if (config->KvpncDebugLevel > 5)
config->appendLogEntry ( TQString("[readOutGetSmartcardSlots raw] "+TQString(msg_raw)) ,config->debug );
@@ -1680,7 +1680,7 @@ void Utils::readOutGetSmartcardSlots(KProcess * proc, char * buffer, int b
if ( msg.contains( "Slot" ) && !msg.contains("empty") )
{
//std::cout << msg.ascii() << std::endl;
-// KMessageBox::information( 0, i18n( "msg: %1" ).arg( msg.stripWhiteSpace() ), TQString("foo") );
+// KMessageBox::information( 0, i18n( "msg: %1" ).tqarg( msg.stripWhiteSpace() ), TQString("foo") );
// we put in this format: <id>:<name>
TQString id = msg.stripWhiteSpace().section( ' ', 1, 1 );
TQString name = msg.stripWhiteSpace().remove(TQString("Slot "+id)).stripWhiteSpace();
@@ -1702,7 +1702,7 @@ void Utils::readOutGetSmartcardCertsFromSlot()
// KMessageBox::sorry( 0, TQString("msg: "+msg), TQString("foo1"),0 );
Pkcs11CertFound=true;
}
-// KMessageBox::information( 0, i18n( "msg: %1" ).arg( msg ), TQString("foo") );
+// KMessageBox::information( 0, i18n( "msg: %1" ).tqarg( msg ), TQString("foo") );
if (IdType == "id")
{
if ( msg.contains( "ID:" ) && Pkcs11CertFound==true ) {
@@ -1815,7 +1815,7 @@ void Utils::readOutGetOpenvpnPkcs11Ids()
if (config->KvpncDebugLevel > 5)
config->appendLogEntry ( TQString("[readOutGetOpenvpnPkcs11Ids] "+TQString(msg)) ,config->debug );
-// KMessageBox::information( 0, i18n( "msg: %1" ).arg( msg ), TQString("foo") );
+// KMessageBox::information( 0, i18n( "msg: %1" ).tqarg( msg ), TQString("foo") );
if ( msg.contains( "Serialized id:" ))
{
//std::cout << msg.ascii() << std::endl;