diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-31 13:21:35 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-31 13:21:35 -0600 |
| commit | f3abc0d1c6012942154b22b5ba0dcd031150d7db (patch) | |
| tree | 7a993ff1510d5b0e0bcd60c9a79e056606e14d82 /src/kvpnc.cpp | |
| parent | c4eeaf21da0a11beb0bcc782652327518bff882b (diff) | |
| download | kvpnc-f3abc0d1c6012942154b22b5ba0dcd031150d7db.tar.gz kvpnc-f3abc0d1c6012942154b22b5ba0dcd031150d7db.zip | |
Rename KStandard for enhanced compatibility with KDE4
Diffstat (limited to 'src/kvpnc.cpp')
| -rw-r--r-- | src/kvpnc.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/kvpnc.cpp b/src/kvpnc.cpp index f109d0a..eaa2529 100644 --- a/src/kvpnc.cpp +++ b/src/kvpnc.cpp @@ -537,7 +537,7 @@ void KVpnc::slotSettings() { if ( !GlobalConfig->logfile.isOpen() ) { - KStandardDirs * dirs = TDEGlobal::dirs(); + TDEStandardDirs * dirs = TDEGlobal::dirs(); TQString logfileName = TQString ( dirs->saveLocation ( "data" ) ); TQString logfilePath = TQString ( logfileName + "/kvpnc/kvpnc.log" ); //KMessageBox::information( this, "info", logfileName ); @@ -2910,9 +2910,9 @@ void KVpnc::connectClicked() // looking for setkey if ( GlobalConfig->useDefaultPaths ) { - GlobalConfig->pathToSetkey = KStandardDirs::findExe ( "setkey", TQString() ); + GlobalConfig->pathToSetkey = TDEStandardDirs::findExe ( "setkey", TQString() ); } - else if ( GlobalConfig->pathToSetkey.isEmpty() || KStandardDirs::findExe ( GlobalConfig->pathToSetkey.section ( '/', -1, -1 ), GlobalConfig->pathToSetkey.section ( '/', 0, -2 ) ).isEmpty() ) + else if ( GlobalConfig->pathToSetkey.isEmpty() || TDEStandardDirs::findExe ( GlobalConfig->pathToSetkey.section ( '/', -1, -1 ), GlobalConfig->pathToSetkey.section ( '/', 0, -2 ) ).isEmpty() ) { KMessageBox::error ( this, i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "setkey" ).arg ( GlobalConfig->pathToSetkey ) ); GlobalConfig->appendLogEntry ( i18n ( "Unable to find \"%1\" at \"%2\"!" ).arg ( "setkey" ).arg ( GlobalConfig->pathToSetkey ), GlobalConfig->error ); @@ -6217,7 +6217,7 @@ void KVpnc::connectClicked() { /* use cert on smartcard */ // Utils(GlobalConfig).getSmartcardInfo(); - // if ( GlobalConfig->pathToPkcs11Tool.isEmpty() || KStandardDirs::findExe( GlobalConfig->pathToPkcs11Tool.section( '/', -1, -1 ), GlobalConfig->pathTopathToPkcs11Tool.section( '/', 0, -2 ) ).isEmpty() ) + // if ( GlobalConfig->pathToPkcs11Tool.isEmpty() || TDEStandardDirs::findExe( GlobalConfig->pathToPkcs11Tool.section( '/', -1, -1 ), GlobalConfig->pathTopathToPkcs11Tool.section( '/', 0, -2 ) ).isEmpty() ) // { // KMessageBox::error( this, i18n( "Unable to find \"%1\" at \"%2\"!" ).arg( "pkcs11-tool" ).arg( GlobalConfig->pathToPkcs11Tool) ); // GlobalConfig->appendLogEntry( i18n( "Unable to find \"%1\" at \"%2\"!" ).arg( "pkcs11-tool" ).arg( GlobalConfig->pathToPkcs11Tool ), GlobalConfig->error ); @@ -11131,10 +11131,10 @@ void KVpnc::helpClicked() // // looking for vpnc // if ( GlobalConfig->useDefaultPaths ){ - // GlobalConfig->pathToVpnc= KStandardDirs::findExe("vpnc",TQString()); + // GlobalConfig->pathToVpnc= TDEStandardDirs::findExe("vpnc",TQString()); // kdDebug() << "vpnc found at; " << GlobalConfig->pathToVpnc << endl; // } - // if ( GlobalConfig->pathToVpnc.isEmpty() || KStandardDirs::findExe( GlobalConfig->pathToVpnc.section('/',-1,-1),GlobalConfig->pathToVpnc.section('/',0,-2)).isEmpty()) + // if ( GlobalConfig->pathToVpnc.isEmpty() || TDEStandardDirs::findExe( GlobalConfig->pathToVpnc.section('/',-1,-1),GlobalConfig->pathToVpnc.section('/',0,-2)).isEmpty()) // { // kdDebug() << "vpnc not found!" << endl; // } @@ -22918,7 +22918,7 @@ void KVpnc::saveGuiOptions() void KVpnc::startConnectionStatusCheck() { - KStandardDirs * dirs = TDEGlobal::dirs(); + TDEStandardDirs * dirs = TDEGlobal::dirs(); TQString PingCheckScript = TQString ( dirs->findResource ( "data", "kvpnc/ping_check.sh" ) ); //GlobalConfig->appendLogEntry( TQString("PingCheckScript : " +PingCheckScript), GlobalConfig->debug); ConnectionStatusCheckProcess = new TQProcess ( this ); |