summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog2
-rw-r--r--src/kfeedback.cpp6
-rw-r--r--src/kvpnc.cpp40
-rw-r--r--src/kvpnc.h8
-rw-r--r--src/kvpncconfig.cpp16
-rw-r--r--src/logviewerdialog.cpp10
-rw-r--r--src/preferencesdialog.cpp8
-rw-r--r--src/toolsinfodialog.cpp4
-rw-r--r--src/utils.cpp14
-rw-r--r--src/utils.h4
-rw-r--r--src/vpntypesinfodialog.cpp4
11 files changed, 58 insertions, 58 deletions
diff --git a/ChangeLog b/ChangeLog
index fd044a8..686306b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -179,7 +179,7 @@
pptp crash fixes
2010-01-07 Christoph Thielecke <crissi99@gmx.de>
- use KProcess instead QProcess in some cases at utils
+ use TDEProcess instead QProcess in some cases at utils
openvpn config option fixes
tun device check more reliable made
openvpn version checking for script security parameter fixed
diff --git a/src/kfeedback.cpp b/src/kfeedback.cpp
index 3d16646..abce962 100644
--- a/src/kfeedback.cpp
+++ b/src/kfeedback.cpp
@@ -117,7 +117,7 @@ KFeedbackForm::KFeedbackForm( const TQString & feedbackMailAddress,
label = new TQLabel( hbox );
TQ_CHECK_PTR( label );
- label->setPixmap( KGlobal::iconLoader()->loadIcon( "edit", KIcon::Small ) );
+ label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "edit", KIcon::Small ) );
label->setSizePolicy( pol );
label = new TQLabel( i18n( " must be answered before a mail can be sent.") , hbox );
@@ -155,7 +155,7 @@ KFeedbackForm::sendMail()
TQString subject;
- const TDEAboutData * aboutData = KGlobal::instance()->aboutData();
+ const TDEAboutData * aboutData = TDEGlobal::instance()->aboutData();
if ( aboutData )
subject = aboutData->programName() + "-" + aboutData->version();
@@ -343,7 +343,7 @@ KFeedbackQuestion::KFeedbackQuestion( KFeedbackQuestionList * parent,
{
if ( required )
{
- setPixmap( 0, KGlobal::iconLoader()->loadIcon( "edit", KIcon::Small ) );
+ setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "edit", KIcon::Small ) );
}
setOpen( open );
diff --git a/src/kvpnc.cpp b/src/kvpnc.cpp
index c79d956..afd1140 100644
--- a/src/kvpnc.cpp
+++ b/src/kvpnc.cpp
@@ -357,9 +357,9 @@ KVpnc::~KVpnc()
void KVpnc::initAction()
{
- disconnectedIcon = KGlobal::iconLoader() ->loadIcon ( "disconnected", KIcon::NoGroup, 22 );
- connectedIcon = KGlobal::iconLoader() ->loadIcon ( "connected", KIcon::NoGroup, 22 );
- connectingIcon = KGlobal::iconLoader() ->loadIcon ( "connecting", KIcon::NoGroup, 22 );
+ disconnectedIcon = TDEGlobal::iconLoader() ->loadIcon ( "disconnected", KIcon::NoGroup, 22 );
+ connectedIcon = TDEGlobal::iconLoader() ->loadIcon ( "connected", KIcon::NoGroup, 22 );
+ connectingIcon = TDEGlobal::iconLoader() ->loadIcon ( "connecting", KIcon::NoGroup, 22 );
setIcon ( disconnectedIcon );
( void* ) KStdAction::quit ( this, TQT_SLOT ( quitCalled() ), actionCollection() );
@@ -537,7 +537,7 @@ void KVpnc::slotSettings()
{
if ( !GlobalConfig->logfile.isOpen() )
{
- KStandardDirs * dirs = KGlobal::dirs();
+ KStandardDirs * dirs = TDEGlobal::dirs();
TQString logfileName = TQString ( dirs->saveLocation ( "data" ) );
TQString logfilePath = TQString ( logfileName + "/kvpnc/kvpnc.log" );
//KMessageBox::information( this, "info", logfileName );
@@ -1000,7 +1000,7 @@ void KVpnc::restore()
void KVpnc::saveProperties ( KConfig* c )
{
- TQString saveDir = KGlobal::dirs()->saveLocation ( "appdata", "sessions/" + tqApp->sessionId() + "/", true );
+ TQString saveDir = TDEGlobal::dirs()->saveLocation ( "appdata", "sessions/" + tqApp->sessionId() + "/", true );
c = new KSimpleConfig ( saveDir + "list", false );
c->setGroup ( "Saved Session" );
@@ -1010,7 +1010,7 @@ void KVpnc::saveProperties ( KConfig* c )
void KVpnc::readProperties ( KConfig* c )
{
- TQString saveDir = KGlobal::dirs()->saveLocation ( "appdata", "sessions/" + tqApp->sessionId() + "/", true );
+ TQString saveDir = TDEGlobal::dirs()->saveLocation ( "appdata", "sessions/" + tqApp->sessionId() + "/", true );
c = new KSimpleConfig ( saveDir + "list", true );
c->setGroup ( "Saved Session" );
delete c;
@@ -7973,12 +7973,12 @@ void KVpnc::connectClicked()
if ( GlobalConfig->currentProfile->getExecuteCmdBeforeConnect() )
executeCommandBeforeConnect();
- SshProcess = new KProcess;
+ SshProcess = new TDEProcess;
*SshProcess << GlobalConfig->pathToSsh ;
// SshProcess->setExecutable(GlobalConfig->pathToSsh);
/*
- connect(m_process, TQT_SIGNAL(processExited(KProcess*)),
- this, TQT_SLOT(slotProcessExited(KProcess*)));*/
+ connect(m_process, TQT_SIGNAL(processExited(TDEProcess*)),
+ this, TQT_SLOT(slotProcessExited(TDEProcess*)));*/
// TQString AskPassScript= tmpPath+"ssh."+GlobalConfig->currentProfile->getName()+".askpass.sh";
//
@@ -8144,8 +8144,8 @@ void KVpnc::connectClicked()
}
- connect ( SshProcess, TQT_SIGNAL ( receivedStdout ( KProcess *, char *, int ) ), this, TQT_SLOT ( readFromStdout_ssh ( KProcess *, char *, int ) ) );
- connect ( SshProcess, TQT_SIGNAL ( receivedStderr ( KProcess *, char *, int ) ), this, TQT_SLOT ( readFromStderr_ssh ( KProcess *, char *, int ) ) );
+ connect ( SshProcess, TQT_SIGNAL ( receivedStdout ( TDEProcess *, char *, int ) ), this, TQT_SLOT ( readFromStdout_ssh ( TDEProcess *, char *, int ) ) );
+ connect ( SshProcess, TQT_SIGNAL ( receivedStderr ( TDEProcess *, char *, int ) ), this, TQT_SLOT ( readFromStderr_ssh ( TDEProcess *, char *, int ) ) );
// connect( SshProcess, TQT_SIGNAL( processExited() ), this, TQT_SLOT( sshExited() ) );
GlobalConfig->appendLogEntry ( i18n ( "Trying to connect to server \"%1\" with ...\n" ).arg ( GlobalConfig->currentProfile->getGateway() ) ,GlobalConfig->info );
@@ -8179,11 +8179,11 @@ void KVpnc::connectClicked()
return;
}
-// SshProcess->setUsePty(KProcess::All ,true);
+// SshProcess->setUsePty(TDEProcess::All ,true);
-// if ( !SshProcess->start(KProcess::NotifyOnExit,KProcess::Communication(KProcess::All)))
-// if ( !SshProcess->start(KProcess::RunMode(KProcess::NotifyOnExit),KProcess::Communication(KProcess::All)))
- if ( !SshProcess->start ( KProcess::NotifyOnExit, KProcess::All ) )
+// if ( !SshProcess->start(TDEProcess::NotifyOnExit,TDEProcess::Communication(TDEProcess::All)))
+// if ( !SshProcess->start(TDEProcess::RunMode(TDEProcess::NotifyOnExit),TDEProcess::Communication(TDEProcess::All)))
+ if ( !SshProcess->start ( TDEProcess::NotifyOnExit, TDEProcess::All ) )
{
KMessageBox::sorry ( this, i18n ( "\"%1\" start failed!" ).arg ( "ssh" ) );
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( "ssh" ) , GlobalConfig->error );
@@ -11370,7 +11370,7 @@ void KVpnc::vpnTypesInfoClicked()
{
this->slotStatusMsg ( i18n ( "Calling KVpnc website..." ), ID_FLASH_MSG );
TQString donateurl = "http://home.gna.org/kvpnc/en/donate.html";
- TQString browser = TQString ( KConfigGroup ( KGlobal::config(), "General" ).readEntry ( "BrowserApplication" ) ).remove ( "!", "" );
+ TQString browser = TQString ( KConfigGroup ( TDEGlobal::config(), "General" ).readEntry ( "BrowserApplication" ) ).remove ( "!", "" );
if ( browser.isEmpty() )
browser = "konqueror";
@@ -11407,7 +11407,7 @@ void KVpnc::vpnTypesInfoClicked()
void KVpnc::reportBugClicked()
{
TQString bugreporturl = "http://bugs.trinitydesktop.org";
- TQString browser = TQString ( KConfigGroup ( KGlobal::config(), "General" ).readEntry ( "BrowserApplication" ) ).remove ( "!", "" );
+ TQString browser = TQString ( KConfigGroup ( TDEGlobal::config(), "General" ).readEntry ( "BrowserApplication" ) ).remove ( "!", "" );
if ( browser.isEmpty() )
browser = "konqueror";
@@ -17719,7 +17719,7 @@ void KVpnc::readFromStderr_vtun()
}
}
-void KVpnc::readFromStdout_ssh ( KProcess *, char *buffer, int buflen )
+void KVpnc::readFromStdout_ssh ( TDEProcess *, char *buffer, int buflen )
{
// while ( SshProcess->canReadLineStdout() )
// {
@@ -18133,7 +18133,7 @@ void KVpnc::readFromStdout_ssh ( KProcess *, char *buffer, int buflen )
}
}
-void KVpnc::readFromStderr_ssh ( KProcess *, char *buffer, int buflen )
+void KVpnc::readFromStderr_ssh ( TDEProcess *, char *buffer, int buflen )
{
// while ( SshProcess->canReadLineStderr() )
// {
@@ -22918,7 +22918,7 @@ void KVpnc::saveGuiOptions()
void KVpnc::startConnectionStatusCheck()
{
- KStandardDirs * dirs = KGlobal::dirs();
+ KStandardDirs * 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/kvpnc.h b/src/kvpnc.h
index 6c50c4e..086f738 100644
--- a/src/kvpnc.h
+++ b/src/kvpnc.h
@@ -246,7 +246,7 @@ private:
TQString PrettyStatusMessage;
TQProcess *VpncProcess;
- KProcess *IpsecConnectProcess;
+ TDEProcess *IpsecConnectProcess;
TQProcess *DisconnectProcess;
TQProcess *CiscoVpncProcess; //< vpnclient
TQProcess *RacoonProcess; //< racoon
@@ -287,7 +287,7 @@ private:
// TQProcess *DonateProcess;
TQProcess *VtundProcess;
TQProcess *StartStopOpenl2tpProcess;
- KProcess *SshProcess;
+ TDEProcess *SshProcess;
TQProcess *backupDefaultRouteProcess;
TQProcess *pptpdKillProcess;
TQProcess *SshDownProcess;
@@ -401,8 +401,8 @@ private slots:
void readOutput_openvpn();
void readFromStdout_vtun();
void readFromStderr_vtun();
- void readFromStdout_ssh(KProcess *proc, char *buffer, int buflen);
- void readFromStderr_ssh(KProcess *proc, char *buffer, int buflen);
+ void readFromStdout_ssh(TDEProcess *proc, char *buffer, int buflen);
+ void readFromStderr_ssh(TDEProcess *proc, char *buffer, int buflen);
void readFromStdout_executeCommandBeforeConnect();
void readFromStderr_executeCommandBeforeConnect();
void readFromStdout_executeCommandAfterConnect();
diff --git a/src/kvpncconfig.cpp b/src/kvpncconfig.cpp
index 46c10ea..702d876 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 = KGlobal::dirs();
+ KStandardDirs *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 = KGlobal::dirs();
+ KStandardDirs * 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 = KGlobal::dirs();
+ KStandardDirs * 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 = KGlobal::dirs();
+ KStandardDirs *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 = KGlobal::dirs();
+ KStandardDirs * 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 = KGlobal::dirs();
+ KStandardDirs * 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 = KGlobal::dirs();
+ KStandardDirs * 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 = KGlobal::dirs();
+ KStandardDirs * dirs = TDEGlobal::dirs();
TQString filePath = dirs->findResource ( "config", "kvpncrc" );
appPointer->processEvents();
diff --git a/src/logviewerdialog.cpp b/src/logviewerdialog.cpp
index aa429d2..7405c06 100644
--- a/src/logviewerdialog.cpp
+++ b/src/logviewerdialog.cpp
@@ -49,10 +49,10 @@ KDialogBase::Ok|KDialogBase::Cancel,KDialogBase::Ok, true )
this->GlobalConfig = GlobalConfig;
this->app = app;
- // TQPixmap info_icon = KGlobal::iconLoader()->loadIcon( "button_ok", KIcon::NoGroup, 16 );
- // TQPixmap debug_icon = KGlobal::iconLoader()->loadIcon( "button_cancel", KIcon::NoGroup, 16 );
- // TQPixmap error_icon = KGlobal::iconLoader()->loadIcon( "button_ok", KIcon::NoGroup, 16 );
- // TQPixmap debug_icon = KGlobal::iconLoader()->loadIcon( "button_cancel", KIcon::NoGroup, 16 );
+ // TQPixmap info_icon = TDEGlobal::iconLoader()->loadIcon( "button_ok", KIcon::NoGroup, 16 );
+ // TQPixmap debug_icon = TDEGlobal::iconLoader()->loadIcon( "button_cancel", KIcon::NoGroup, 16 );
+ // TQPixmap error_icon = TDEGlobal::iconLoader()->loadIcon( "button_ok", KIcon::NoGroup, 16 );
+ // TQPixmap debug_icon = TDEGlobal::iconLoader()->loadIcon( "button_cancel", KIcon::NoGroup, 16 );
// InfoListView->setSorting(1);
@@ -77,7 +77,7 @@ void LogViewerDialog::accept()
void LogViewerDialog::parseLog()
{
- KStandardDirs *dirs = KGlobal::dirs();
+ KStandardDirs *dirs = TDEGlobal::dirs();
TQString logfileName = dirs->saveLocation( "data" );
logfileName += "/kvpnc/kvpnc.log";
TQFile logfile;
diff --git a/src/preferencesdialog.cpp b/src/preferencesdialog.cpp
index d371011..5ff6fb0 100644
--- a/src/preferencesdialog.cpp
+++ b/src/preferencesdialog.cpp
@@ -91,8 +91,8 @@ PreferencesDialog::PreferencesDialog( TQWidget *parent, TQApplication *app, TQTe
// programsInPathToggled(GlobalConfig->programsInPath);
//
- ok_icon = KGlobal::iconLoader() ->loadIcon( "button_ok", KIcon::NoGroup, 16 );
- wrong_icon = KGlobal::iconLoader() ->loadIcon( "button_cancel", KIcon::NoGroup, 16 );
+ ok_icon = TDEGlobal::iconLoader() ->loadIcon( "button_ok", KIcon::NoGroup, 16 );
+ wrong_icon = TDEGlobal::iconLoader() ->loadIcon( "button_cancel", KIcon::NoGroup, 16 );
unfoldTreeList ();
if ( !showOnlyProfiles )
@@ -6645,8 +6645,8 @@ void PreferencesDialog::RacoonPathChanged( const TQString& )
ConfigDaemonOptionsWidget->RacoonVersionLineEdit->setText( RacoonInfo->Version );
- TQPixmap ok_icon = KGlobal::iconLoader() ->loadIcon( "button_ok", KIcon::NoGroup );
- TQPixmap wrong_icon = KGlobal::iconLoader() ->loadIcon( "button_cancel", KIcon::NoGroup );
+ TQPixmap ok_icon = TDEGlobal::iconLoader() ->loadIcon( "button_ok", KIcon::NoGroup );
+ TQPixmap wrong_icon = TDEGlobal::iconLoader() ->loadIcon( "button_cancel", KIcon::NoGroup );
if ( RacoonInfo->found )
ConfigDaemonOptionsWidget->RacoonStatePixmapLabel->setPixmap( ok_icon );
diff --git a/src/toolsinfodialog.cpp b/src/toolsinfodialog.cpp
index 0c8ed10..0a9ab66 100644
--- a/src/toolsinfodialog.cpp
+++ b/src/toolsinfodialog.cpp
@@ -41,8 +41,8 @@ ToolsInfoDialog::ToolsInfoDialog(KVpncConfig *GlobalConfig, TQWidget *parent, co
setMainWidget(main);
main->InfoListView->setMinimumSize(main->InfoListView->sizeHint());
- TQPixmap ok_icon = KGlobal::iconLoader()->loadIcon( "button_ok", KIcon::NoGroup, 16 );
- TQPixmap wrong_icon = KGlobal::iconLoader()->loadIcon( "button_cancel", KIcon::NoGroup, 16 );
+ TQPixmap ok_icon = TDEGlobal::iconLoader()->loadIcon( "button_ok", KIcon::NoGroup, 16 );
+ TQPixmap wrong_icon = TDEGlobal::iconLoader()->loadIcon( "button_cancel", KIcon::NoGroup, 16 );
ToolInfo *tool=0;
main->InfoListView->setSorting(1);
diff --git a/src/utils.cpp b/src/utils.cpp
index b457bd3..a5d1c46 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -290,7 +290,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 );
- KProcess *chmodProcess = new KProcess;
+ TDEProcess *chmodProcess = new TDEProcess;
*chmodProcess << "/bin/chmod";
*chmodProcess << mode;
*chmodProcess << file;
@@ -1107,7 +1107,7 @@ TQStringList Utils::getSmartcardSlots(TQString ProviderLib)
if ( pathToPkcs11Tool.isEmpty() )
return SmartcardSlots;
- GetSmartcardSlotsProcess = new KProcess;
+ GetSmartcardSlotsProcess = new TDEProcess;
*GetSmartcardSlotsProcess << pathToPkcs11Tool;
if (!ProviderLib.isEmpty())
@@ -1117,11 +1117,11 @@ TQStringList Utils::getSmartcardSlots(TQString ProviderLib)
}
*GetSmartcardSlotsProcess << "-L" ;
- connect( GetSmartcardSlotsProcess, TQT_SIGNAL( receivedStdout ( KProcess *, char *, int)), this, TQT_SLOT(readOutGetSmartcardSlots()));
+ connect( GetSmartcardSlotsProcess, TQT_SIGNAL( receivedStdout ( TDEProcess *, char *, int)), this, TQT_SLOT(readOutGetSmartcardSlots()));
- if ( !GetSmartcardSlotsProcess->start ( KProcess::NotifyOnExit, KProcess::All ) )
+ if ( !GetSmartcardSlotsProcess->start ( TDEProcess::NotifyOnExit, TDEProcess::All ) )
{
- disconnect( GetSmartcardSlotsProcess, TQT_SIGNAL( receivedStdout ( KProcess *, char *, int)), this, TQT_SLOT(readOutGetSmartcardSlots()));
+ disconnect( GetSmartcardSlotsProcess, TQT_SIGNAL( receivedStdout ( TDEProcess *, char *, int)), this, TQT_SLOT(readOutGetSmartcardSlots()));
delete GetSmartcardSlotsProcess;
GetSmartcardCertsFromSlotProcess=0L;
config->appendLogEntry(i18n("Unable to fetch smartcard slots via pkcs11-tool!"), config->error);
@@ -1137,7 +1137,7 @@ TQStringList Utils::getSmartcardSlots(TQString ProviderLib)
usleep ( 500 );
config->appPointer->processEvents();
}
- disconnect( GetSmartcardSlotsProcess, TQT_SIGNAL( receivedStdout ( KProcess *, char *, int)), this, TQT_SLOT(readOutGetSmartcardSlots()));
+ disconnect( GetSmartcardSlotsProcess, TQT_SIGNAL( receivedStdout ( TDEProcess *, char *, int)), this, TQT_SLOT(readOutGetSmartcardSlots()));
delete GetSmartcardSlotsProcess;
GetSmartcardCertsFromSlotProcess=0L;
if (config->KvpncDebugLevel > 5)
@@ -1661,7 +1661,7 @@ void Utils::readOutGetEmailAddressOfCert()
}
}
-void Utils::readOutGetSmartcardSlots(KProcess * proc, char * buffer, int buflen)
+void Utils::readOutGetSmartcardSlots(TDEProcess * proc, char * buffer, int buflen)
{
TQString msg_raw = TQString::fromLatin1(buffer, buflen);
if (config->KvpncDebugLevel > 5)
diff --git a/src/utils.h b/src/utils.h
index 8cd124d..66eb7e5 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -127,7 +127,7 @@ public slots:
void readStdOutGetNameAndPidOfProgramListen();
void readStdErrGetNameAndPidOfProgramListen();
void readOutGetEmailAddressOfCert();
- void readOutGetSmartcardSlots(KProcess * proc, char * buffer, int buflen);
+ void readOutGetSmartcardSlots(TDEProcess * proc, char * buffer, int buflen);
void readOutGetSmartcardCertsFromSlot();
void readOutGetOpenvpnPkcs11Ids();
void readOutNeedsPassphrase();
@@ -164,7 +164,7 @@ private:
TQProcess *OpenvpnDigestProcess;
TQProcess *NameAndPidOfProgramListenProcess;
TQProcess *GetEmailAddressOfCertProcess;
- KProcess *GetSmartcardSlotsProcess;
+ TDEProcess *GetSmartcardSlotsProcess;
TQProcess *GetSmartcardCertsFromSlotProcess;
TQProcess *OpenvpnPkcs11IdsProcess;
TQProcess *GetCertsFromCiscoCertStoreProcess;
diff --git a/src/vpntypesinfodialog.cpp b/src/vpntypesinfodialog.cpp
index 862494f..fba1cd4 100644
--- a/src/vpntypesinfodialog.cpp
+++ b/src/vpntypesinfodialog.cpp
@@ -102,8 +102,8 @@ VpnTypesInfoDialog::VpnTypesInfoDialog ( KVpncConfig *GlobalConfig, TQWidget *pa
main->textLabel1->setText(i18n("The following information about the VPN tyes has been collected:"));
- TQPixmap ok_icon = KGlobal::iconLoader()->loadIcon( "button_ok", KIcon::NoGroup, 16 );
- TQPixmap wrong_icon = KGlobal::iconLoader()->loadIcon( "button_cancel", KIcon::NoGroup, 16 );
+ TQPixmap ok_icon = TDEGlobal::iconLoader()->loadIcon( "button_ok", KIcon::NoGroup, 16 );
+ TQPixmap wrong_icon = TDEGlobal::iconLoader()->loadIcon( "button_cancel", KIcon::NoGroup, 16 );
ToolInfo *tool=0;
main->InfoListView->setSorting(1);
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-18 21:12:29 +0000