summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/kvpnc.cpp14
-rw-r--r--src/kvpncconfig.cpp16
-rw-r--r--src/logviewerdialog.cpp2
3 files changed, 16 insertions, 16 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 );
diff --git a/src/kvpncconfig.cpp b/src/kvpncconfig.cpp
index 12b2b09..c2e2367 100644
--- a/src/kvpncconfig.cpp
+++ b/src/kvpncconfig.cpp
@@ -165,7 +165,7 @@ KVpncConfig::KVpncConfig(TQWidget *parent,KStatusBar *statusbar)
SuccessLogColor=TQt::darkGreen;
DebugLogColor=TQt::yellow;
- KStandardDirs *dirs = TDEGlobal::dirs();
+ TDEStandardDirs *dirs = TDEGlobal::dirs();
logfileName = TQString(dirs->saveLocation( "data" ));
TQString logfilePath = TQString(logfileName + "/kvpnc/kvpnc.log");
logfile.setName( logfilePath );
@@ -193,7 +193,7 @@ void KVpncConfig::appendLogEntry( TQString msg, LogType type )
{
if ( !logfile.isOpen() )
{
- KStandardDirs * dirs = TDEGlobal::dirs();
+ TDEStandardDirs * dirs = TDEGlobal::dirs();
TQString logfileName = dirs->saveLocation( "data" );
logfileName += "/kvpnc/kvpnc.log"; // /root.kde/share/apps/kvpnc.log
// KMessageBox::information( this, logfileName, "info" );
@@ -322,7 +322,7 @@ void KVpncConfig::saveOptions(bool saveOneProfile, TQString Profile)
{
if (saveOneProfile && Profile.isEmpty())
return;
- KStandardDirs * dirs = TDEGlobal::dirs();
+ TDEStandardDirs * dirs = TDEGlobal::dirs();
TQString filePath = dirs->findResource ( "config", "kvpncrc" );
TQFile::remove
( filePath );
@@ -1006,7 +1006,7 @@ void KVpncConfig::loadOptions()
if ( writeLogFile )
if ( !logfile.isOpen() )
{
- KStandardDirs *dirs = TDEGlobal::dirs();
+ TDEStandardDirs *dirs = TDEGlobal::dirs();
TQDir AppFolder (TQString(dirs->saveLocation( "data" )+"/kvpnc"));
if (!AppFolder.exists())
@@ -1448,7 +1448,7 @@ void KVpncConfig::loadOptions()
if ( oldConfigurationFound )
{
// delete configuration file
- KStandardDirs * dirs = TDEGlobal::dirs();
+ TDEStandardDirs * dirs = TDEGlobal::dirs();
TQString filePath = dirs->findResource ( "config", "kvpncrc" );
TQFile::remove
( filePath );
@@ -4286,7 +4286,7 @@ TQString KVpncConfig::removeWhiteSpaceAtBegin(const TQString str)
void KVpncConfig::doBackupConfig()
{
- KStandardDirs * dirs = TDEGlobal::dirs();
+ TDEStandardDirs * dirs = TDEGlobal::dirs();
TQString config = TQString(dirs->saveLocation( "config" )+"/kvpncrc");
TQFile OriginalConfFile( config );
TQFile backupOriginalConfFile( config+".backup" );
@@ -4306,7 +4306,7 @@ void KVpncConfig::doBackupConfig()
void KVpncConfig::restoreBackupConfig()
{
- KStandardDirs * dirs = TDEGlobal::dirs();
+ TDEStandardDirs * dirs = TDEGlobal::dirs();
TQString config = TQString(dirs->saveLocation( "config" )+"/kvpncrc");
TQFile OriginalConfFile( config+".backup" );
TQFile backupOriginalConfFile( config );
@@ -4339,7 +4339,7 @@ void KVpncConfig::getToolsInfo()
void KVpncConfig::removeEntry(TQString Name)
{
- KStandardDirs * dirs = TDEGlobal::dirs();
+ TDEStandardDirs * dirs = TDEGlobal::dirs();
TQString filePath = dirs->findResource ( "config", "kvpncrc" );
appPointer->processEvents();
diff --git a/src/logviewerdialog.cpp b/src/logviewerdialog.cpp
index 7405c06..3a22353 100644
--- a/src/logviewerdialog.cpp
+++ b/src/logviewerdialog.cpp
@@ -77,7 +77,7 @@ void LogViewerDialog::accept()
void LogViewerDialog::parseLog()
{
- KStandardDirs *dirs = TDEGlobal::dirs();
+ TDEStandardDirs *dirs = TDEGlobal::dirs();
TQString logfileName = dirs->saveLocation( "data" );
logfileName += "/kvpnc/kvpnc.log";
TQFile logfile;
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-19 02:50:58 +0000