TDE
/
kvpnc
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kvpnc
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent e6af9bb1ec
commit 7251ddd58d
11 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File

2
ChangeLog
Unescape View File

@ -179,7 +179,7 @@
pptp crash fixes pptp crash fixes
2010-01-07 Christoph Thielecke <crissi99@gmx.de> 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 openvpn config option fixes
tun device check more reliable made tun device check more reliable made
openvpn version checking for script security parameter fixed openvpn version checking for script security parameter fixed

6
src/kfeedback.cpp
Unescape View File

@ -117,7 +117,7 @@ KFeedbackForm::KFeedbackForm( const TQString & feedbackMailAddress,
label = new TQLabel( hbox ); label = new TQLabel( hbox );
TQ_CHECK_PTR( label ); TQ_CHECK_PTR( label );
label->setPixmap( KGlobal::iconLoader()->loadIcon( "edit", KIcon::Small ) ); label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "edit", KIcon::Small ) );
label->setSizePolicy( pol ); label->setSizePolicy( pol );
label = new TQLabel( i18n( " must be answered before a mail can be sent.") , hbox ); label = new TQLabel( i18n( " must be answered before a mail can be sent.") , hbox );
@ -155,7 +155,7 @@ KFeedbackForm::sendMail()
TQString subject; TQString subject;
const TDEAboutData * aboutData = KGlobal::instance()->aboutData(); const TDEAboutData * aboutData = TDEGlobal::instance()->aboutData();
if ( aboutData ) if ( aboutData )
subject = aboutData->programName() + "-" + aboutData->version(); subject = aboutData->programName() + "-" + aboutData->version();
@ -343,7 +343,7 @@ KFeedbackQuestion::KFeedbackQuestion( KFeedbackQuestionList * parent,
{ {
if ( required ) if ( required )
{ {
setPixmap( 0, KGlobal::iconLoader()->loadIcon( "edit", KIcon::Small ) ); setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "edit", KIcon::Small ) );
} }
setOpen( open ); setOpen( open );

40
src/kvpnc.cpp
Unescape View File

@ -357,9 +357,9 @@ KVpnc::~KVpnc()
void KVpnc::initAction() void KVpnc::initAction()
{ {
disconnectedIcon = KGlobal::iconLoader() ->loadIcon ( "disconnected", KIcon::NoGroup, 22 ); disconnectedIcon = TDEGlobal::iconLoader() ->loadIcon ( "disconnected", KIcon::NoGroup, 22 );
connectedIcon = KGlobal::iconLoader() ->loadIcon ( "connected", KIcon::NoGroup, 22 ); connectedIcon = TDEGlobal::iconLoader() ->loadIcon ( "connected", KIcon::NoGroup, 22 );
connectingIcon = KGlobal::iconLoader() ->loadIcon ( "connecting", KIcon::NoGroup, 22 ); connectingIcon = TDEGlobal::iconLoader() ->loadIcon ( "connecting", KIcon::NoGroup, 22 );
setIcon ( disconnectedIcon ); setIcon ( disconnectedIcon );
( void* ) KStdAction::quit ( this, TQT_SLOT ( quitCalled() ), actionCollection() ); ( void* ) KStdAction::quit ( this, TQT_SLOT ( quitCalled() ), actionCollection() );
@ -537,7 +537,7 @@ void KVpnc::slotSettings()
{ {
if ( !GlobalConfig->logfile.isOpen() ) if ( !GlobalConfig->logfile.isOpen() )
{ {
KStandardDirs * dirs = KGlobal::dirs(); KStandardDirs * dirs = TDEGlobal::dirs();
TQString logfileName = TQString ( dirs->saveLocation ( "data" ) ); TQString logfileName = TQString ( dirs->saveLocation ( "data" ) );
TQString logfilePath = TQString ( logfileName + "/kvpnc/kvpnc.log" ); TQString logfilePath = TQString ( logfileName + "/kvpnc/kvpnc.log" );
//KMessageBox::information( this, "info", logfileName ); //KMessageBox::information( this, "info", logfileName );
@ -1000,7 +1000,7 @@ void KVpnc::restore()
void KVpnc::saveProperties ( KConfig* c ) 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 = new KSimpleConfig ( saveDir + "list", false );
c->setGroup ( "Saved Session" ); c->setGroup ( "Saved Session" );
@ -1010,7 +1010,7 @@ void KVpnc::saveProperties ( KConfig* c )
void KVpnc::readProperties ( 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 = new KSimpleConfig ( saveDir + "list", true );
c->setGroup ( "Saved Session" ); c->setGroup ( "Saved Session" );
delete c; delete c;
@ -7973,12 +7973,12 @@ void KVpnc::connectClicked()
if ( GlobalConfig->currentProfile->getExecuteCmdBeforeConnect() ) if ( GlobalConfig->currentProfile->getExecuteCmdBeforeConnect() )
executeCommandBeforeConnect(); executeCommandBeforeConnect();
SshProcess = new KProcess; SshProcess = new TDEProcess;
*SshProcess << GlobalConfig->pathToSsh ; *SshProcess << GlobalConfig->pathToSsh ;
// SshProcess->setExecutable(GlobalConfig->pathToSsh); // SshProcess->setExecutable(GlobalConfig->pathToSsh);
/* /*
connect(m_process, TQT_SIGNAL(processExited(KProcess*)), connect(m_process, TQT_SIGNAL(processExited(TDEProcess*)),
this, TQT_SLOT(slotProcessExited(KProcess*)));*/ this, TQT_SLOT(slotProcessExited(TDEProcess*)));*/
// TQString AskPassScript= tmpPath+"ssh."+GlobalConfig->currentProfile->getName()+".askpass.sh"; // 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 ( receivedStdout ( TDEProcess *, char *, int ) ), this, TQT_SLOT ( readFromStdout_ssh ( TDEProcess *, char *, int ) ) );
connect ( SshProcess, TQT_SIGNAL ( receivedStderr ( KProcess *, char *, int ) ), this, TQT_SLOT ( readFromStderr_ssh ( KProcess *, 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() ) ); // 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 ); 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; return;
} }
// SshProcess->setUsePty(KProcess::All ,true); // SshProcess->setUsePty(TDEProcess::All ,true);
// if ( !SshProcess->start(KProcess::NotifyOnExit,KProcess::Communication(KProcess::All))) // if ( !SshProcess->start(TDEProcess::NotifyOnExit,TDEProcess::Communication(TDEProcess::All)))
// if ( !SshProcess->start(KProcess::RunMode(KProcess::NotifyOnExit),KProcess::Communication(KProcess::All))) // if ( !SshProcess->start(TDEProcess::RunMode(TDEProcess::NotifyOnExit),TDEProcess::Communication(TDEProcess::All)))
if ( !SshProcess->start ( KProcess::NotifyOnExit, KProcess::All ) ) if ( !SshProcess->start ( TDEProcess::NotifyOnExit, TDEProcess::All ) )
{ {
KMessageBox::sorry ( this, i18n ( "\"%1\" start failed!" ).arg ( "ssh" ) ); KMessageBox::sorry ( this, i18n ( "\"%1\" start failed!" ).arg ( "ssh" ) );
GlobalConfig->appendLogEntry ( i18n ( "\"%1\" start failed!" ).arg ( "ssh" ) , GlobalConfig->error ); 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 ); this->slotStatusMsg ( i18n ( "Calling KVpnc website..." ), ID_FLASH_MSG );
TQString donateurl = "http://home.gna.org/kvpnc/en/donate.html"; 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() ) if ( browser.isEmpty() )
browser = "konqueror"; browser = "konqueror";
@ -11407,7 +11407,7 @@ void KVpnc::vpnTypesInfoClicked()
void KVpnc::reportBugClicked() void KVpnc::reportBugClicked()
{ {
TQString bugreporturl = "http://bugs.trinitydesktop.org"; 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() ) if ( browser.isEmpty() )
browser = "konqueror"; 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() ) // 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() ) // while ( SshProcess->canReadLineStderr() )
// { // {
@ -22918,7 +22918,7 @@ void KVpnc::saveGuiOptions()
void KVpnc::startConnectionStatusCheck() void KVpnc::startConnectionStatusCheck()
{ {
KStandardDirs * dirs = KGlobal::dirs(); KStandardDirs * dirs = TDEGlobal::dirs();
TQString PingCheckScript = TQString ( dirs->findResource ( "data", "kvpnc/ping_check.sh" ) ); TQString PingCheckScript = TQString ( dirs->findResource ( "data", "kvpnc/ping_check.sh" ) );
//GlobalConfig->appendLogEntry( TQString("PingCheckScript : " +PingCheckScript), GlobalConfig->debug); //GlobalConfig->appendLogEntry( TQString("PingCheckScript : " +PingCheckScript), GlobalConfig->debug);
ConnectionStatusCheckProcess = new TQProcess ( this ); ConnectionStatusCheckProcess = new TQProcess ( this );

8
src/kvpnc.h
Unescape View File

@ -246,7 +246,7 @@ private:
TQString PrettyStatusMessage; TQString PrettyStatusMessage;
TQProcess *VpncProcess; TQProcess *VpncProcess;
KProcess *IpsecConnectProcess; TDEProcess *IpsecConnectProcess;
TQProcess *DisconnectProcess; TQProcess *DisconnectProcess;
TQProcess *CiscoVpncProcess; //< vpnclient TQProcess *CiscoVpncProcess; //< vpnclient
TQProcess *RacoonProcess; //< racoon TQProcess *RacoonProcess; //< racoon
@ -287,7 +287,7 @@ private:
// TQProcess *DonateProcess; // TQProcess *DonateProcess;
TQProcess *VtundProcess; TQProcess *VtundProcess;
TQProcess *StartStopOpenl2tpProcess; TQProcess *StartStopOpenl2tpProcess;
KProcess *SshProcess; TDEProcess *SshProcess;
TQProcess *backupDefaultRouteProcess; TQProcess *backupDefaultRouteProcess;
TQProcess *pptpdKillProcess; TQProcess *pptpdKillProcess;
TQProcess *SshDownProcess; TQProcess *SshDownProcess;
@ -401,8 +401,8 @@ private slots:
void readOutput_openvpn(); void readOutput_openvpn();
void readFromStdout_vtun(); void readFromStdout_vtun();
void readFromStderr_vtun(); void readFromStderr_vtun();
void readFromStdout_ssh(KProcess *proc, char *buffer, int buflen); void readFromStdout_ssh(TDEProcess *proc, char *buffer, int buflen);
void readFromStderr_ssh(KProcess *proc, char *buffer, int buflen); void readFromStderr_ssh(TDEProcess *proc, char *buffer, int buflen);
void readFromStdout_executeCommandBeforeConnect(); void readFromStdout_executeCommandBeforeConnect();
void readFromStderr_executeCommandBeforeConnect(); void readFromStderr_executeCommandBeforeConnect();
void readFromStdout_executeCommandAfterConnect(); void readFromStdout_executeCommandAfterConnect();

16
src/kvpncconfig.cpp
Unescape View File

@ -165,7 +165,7 @@ KVpncConfig::KVpncConfig(TQWidget *parent,KStatusBar *statusbar)
SuccessLogColor=TQt::darkGreen; SuccessLogColor=TQt::darkGreen;
DebugLogColor=TQt::yellow; DebugLogColor=TQt::yellow;
KStandardDirs *dirs = KGlobal::dirs(); KStandardDirs *dirs = TDEGlobal::dirs();
logfileName = TQString(dirs->saveLocation( "data" )); logfileName = TQString(dirs->saveLocation( "data" ));
TQString logfilePath = TQString(logfileName + "/kvpnc/kvpnc.log"); TQString logfilePath = TQString(logfileName + "/kvpnc/kvpnc.log");
logfile.setName( logfilePath ); logfile.setName( logfilePath );
@ -193,7 +193,7 @@ void KVpncConfig::appendLogEntry( TQString msg, LogType type )
{ {
if ( !logfile.isOpen() ) if ( !logfile.isOpen() )
{ {
KStandardDirs * dirs = KGlobal::dirs(); KStandardDirs * dirs = TDEGlobal::dirs();
TQString logfileName = dirs->saveLocation( "data" ); TQString logfileName = dirs->saveLocation( "data" );
logfileName += "/kvpnc/kvpnc.log"; // /root.kde/share/apps/kvpnc.log logfileName += "/kvpnc/kvpnc.log"; // /root.kde/share/apps/kvpnc.log
// KMessageBox::information( this, logfileName, "info" ); // KMessageBox::information( this, logfileName, "info" );
@ -322,7 +322,7 @@ void KVpncConfig::saveOptions(bool saveOneProfile, TQString Profile)
{ {
if (saveOneProfile && Profile.isEmpty()) if (saveOneProfile && Profile.isEmpty())
return; return;
KStandardDirs * dirs = KGlobal::dirs(); KStandardDirs * dirs = TDEGlobal::dirs();
TQString filePath = dirs->findResource ( "config", "kvpncrc" ); TQString filePath = dirs->findResource ( "config", "kvpncrc" );
TQFile::remove TQFile::remove
( filePath ); ( filePath );
@ -1006,7 +1006,7 @@ void KVpncConfig::loadOptions()
if ( writeLogFile ) if ( writeLogFile )
if ( !logfile.isOpen() ) if ( !logfile.isOpen() )
{ {
KStandardDirs *dirs = KGlobal::dirs(); KStandardDirs *dirs = TDEGlobal::dirs();
TQDir AppFolder (TQString(dirs->saveLocation( "data" )+"/kvpnc")); TQDir AppFolder (TQString(dirs->saveLocation( "data" )+"/kvpnc"));
if (!AppFolder.exists()) if (!AppFolder.exists())
@ -1448,7 +1448,7 @@ void KVpncConfig::loadOptions()
if ( oldConfigurationFound ) if ( oldConfigurationFound )
{ {
// delete configuration file // delete configuration file
KStandardDirs * dirs = KGlobal::dirs(); KStandardDirs * dirs = TDEGlobal::dirs();
TQString filePath = dirs->findResource ( "config", "kvpncrc" ); TQString filePath = dirs->findResource ( "config", "kvpncrc" );
TQFile::remove TQFile::remove
( filePath ); ( filePath );
@ -4286,7 +4286,7 @@ TQString KVpncConfig::removeWhiteSpaceAtBegin(const TQString str)
void KVpncConfig::doBackupConfig() void KVpncConfig::doBackupConfig()
{ {
KStandardDirs * dirs = KGlobal::dirs(); KStandardDirs * dirs = TDEGlobal::dirs();
TQString config = TQString(dirs->saveLocation( "config" )+"/kvpncrc"); TQString config = TQString(dirs->saveLocation( "config" )+"/kvpncrc");
TQFile OriginalConfFile( config ); TQFile OriginalConfFile( config );
TQFile backupOriginalConfFile( config+".backup" ); TQFile backupOriginalConfFile( config+".backup" );
@ -4306,7 +4306,7 @@ void KVpncConfig::doBackupConfig()
void KVpncConfig::restoreBackupConfig() void KVpncConfig::restoreBackupConfig()
{ {
KStandardDirs * dirs = KGlobal::dirs(); KStandardDirs * dirs = TDEGlobal::dirs();
TQString config = TQString(dirs->saveLocation( "config" )+"/kvpncrc"); TQString config = TQString(dirs->saveLocation( "config" )+"/kvpncrc");
TQFile OriginalConfFile( config+".backup" ); TQFile OriginalConfFile( config+".backup" );
TQFile backupOriginalConfFile( config ); TQFile backupOriginalConfFile( config );
@ -4339,7 +4339,7 @@ void KVpncConfig::getToolsInfo()
void KVpncConfig::removeEntry(TQString Name) void KVpncConfig::removeEntry(TQString Name)
{ {
KStandardDirs * dirs = KGlobal::dirs(); KStandardDirs * dirs = TDEGlobal::dirs();
TQString filePath = dirs->findResource ( "config", "kvpncrc" ); TQString filePath = dirs->findResource ( "config", "kvpncrc" );
appPointer->processEvents(); appPointer->processEvents();

10
src/logviewerdialog.cpp
Unescape View File

@ -49,10 +49,10 @@ KDialogBase::Ok|KDialogBase::Cancel,KDialogBase::Ok, true )
this->GlobalConfig = GlobalConfig; this->GlobalConfig = GlobalConfig;
this->app = app; this->app = app;
// TQPixmap info_icon = KGlobal::iconLoader()->loadIcon( "button_ok", KIcon::NoGroup, 16 ); // TQPixmap info_icon = TDEGlobal::iconLoader()->loadIcon( "button_ok", KIcon::NoGroup, 16 );
// TQPixmap debug_icon = KGlobal::iconLoader()->loadIcon( "button_cancel", KIcon::NoGroup, 16 ); // TQPixmap debug_icon = TDEGlobal::iconLoader()->loadIcon( "button_cancel", KIcon::NoGroup, 16 );
// TQPixmap error_icon = KGlobal::iconLoader()->loadIcon( "button_ok", KIcon::NoGroup, 16 ); // TQPixmap error_icon = TDEGlobal::iconLoader()->loadIcon( "button_ok", KIcon::NoGroup, 16 );
// TQPixmap debug_icon = KGlobal::iconLoader()->loadIcon( "button_cancel", KIcon::NoGroup, 16 ); // TQPixmap debug_icon = TDEGlobal::iconLoader()->loadIcon( "button_cancel", KIcon::NoGroup, 16 );
// InfoListView->setSorting(1); // InfoListView->setSorting(1);
@ -77,7 +77,7 @@ void LogViewerDialog::accept()
void LogViewerDialog::parseLog() void LogViewerDialog::parseLog()
{ {
KStandardDirs *dirs = KGlobal::dirs(); KStandardDirs *dirs = TDEGlobal::dirs();
TQString logfileName = dirs->saveLocation( "data" ); TQString logfileName = dirs->saveLocation( "data" );
logfileName += "/kvpnc/kvpnc.log"; logfileName += "/kvpnc/kvpnc.log";
TQFile logfile; TQFile logfile;

8
src/preferencesdialog.cpp
Unescape View File

@ -91,8 +91,8 @@ PreferencesDialog::PreferencesDialog( TQWidget *parent, TQApplication *app, TQTe
// programsInPathToggled(GlobalConfig->programsInPath); // programsInPathToggled(GlobalConfig->programsInPath);
// //
ok_icon = KGlobal::iconLoader() ->loadIcon( "button_ok", KIcon::NoGroup, 16 ); ok_icon = TDEGlobal::iconLoader() ->loadIcon( "button_ok", KIcon::NoGroup, 16 );
wrong_icon = KGlobal::iconLoader() ->loadIcon( "button_cancel", KIcon::NoGroup, 16 ); wrong_icon = TDEGlobal::iconLoader() ->loadIcon( "button_cancel", KIcon::NoGroup, 16 );
unfoldTreeList (); unfoldTreeList ();
if ( !showOnlyProfiles ) if ( !showOnlyProfiles )
@ -6645,8 +6645,8 @@ void PreferencesDialog::RacoonPathChanged( const TQString& )
ConfigDaemonOptionsWidget->RacoonVersionLineEdit->setText( RacoonInfo->Version ); ConfigDaemonOptionsWidget->RacoonVersionLineEdit->setText( RacoonInfo->Version );
TQPixmap ok_icon = KGlobal::iconLoader() ->loadIcon( "button_ok", KIcon::NoGroup ); TQPixmap ok_icon = TDEGlobal::iconLoader() ->loadIcon( "button_ok", KIcon::NoGroup );
TQPixmap wrong_icon = KGlobal::iconLoader() ->loadIcon( "button_cancel", KIcon::NoGroup ); TQPixmap wrong_icon = TDEGlobal::iconLoader() ->loadIcon( "button_cancel", KIcon::NoGroup );
if ( RacoonInfo->found ) if ( RacoonInfo->found )
ConfigDaemonOptionsWidget->RacoonStatePixmapLabel->setPixmap( ok_icon ); ConfigDaemonOptionsWidget->RacoonStatePixmapLabel->setPixmap( ok_icon );

4
src/toolsinfodialog.cpp
Unescape View File

@ -41,8 +41,8 @@ ToolsInfoDialog::ToolsInfoDialog(KVpncConfig *GlobalConfig, TQWidget *parent, co
setMainWidget(main); setMainWidget(main);
main->InfoListView->setMinimumSize(main->InfoListView->sizeHint()); main->InfoListView->setMinimumSize(main->InfoListView->sizeHint());
TQPixmap ok_icon = KGlobal::iconLoader()->loadIcon( "button_ok", KIcon::NoGroup, 16 ); TQPixmap ok_icon = TDEGlobal::iconLoader()->loadIcon( "button_ok", KIcon::NoGroup, 16 );
TQPixmap wrong_icon = KGlobal::iconLoader()->loadIcon( "button_cancel", KIcon::NoGroup, 16 ); TQPixmap wrong_icon = TDEGlobal::iconLoader()->loadIcon( "button_cancel", KIcon::NoGroup, 16 );
ToolInfo *tool=0; ToolInfo *tool=0;
main->InfoListView->setSorting(1); main->InfoListView->setSorting(1);

14
src/utils.cpp
Unescape View File

@ -290,7 +290,7 @@ bool Utils::unloadKernelModule( TQString Name, TQApplication *app , bool force)
bool Utils::doChmod( TQString file, TQString mode ) bool Utils::doChmod( TQString file, TQString mode )
{ {
config->appendLogEntry ( i18n( "\"%1\" begin." ).arg("chmod"),config->info ); config->appendLogEntry ( i18n( "\"%1\" begin." ).arg("chmod"),config->info );
KProcess *chmodProcess = new KProcess; TDEProcess *chmodProcess = new TDEProcess;
*chmodProcess << "/bin/chmod"; *chmodProcess << "/bin/chmod";
*chmodProcess << mode; *chmodProcess << mode;
*chmodProcess << file; *chmodProcess << file;
@ -1107,7 +1107,7 @@ TQStringList Utils::getSmartcardSlots(TQString ProviderLib)
if ( pathToPkcs11Tool.isEmpty() ) if ( pathToPkcs11Tool.isEmpty() )
return SmartcardSlots; return SmartcardSlots;
GetSmartcardSlotsProcess = new KProcess; GetSmartcardSlotsProcess = new TDEProcess;
*GetSmartcardSlotsProcess << pathToPkcs11Tool; *GetSmartcardSlotsProcess << pathToPkcs11Tool;
if (!ProviderLib.isEmpty()) if (!ProviderLib.isEmpty())
@ -1117,11 +1117,11 @@ TQStringList Utils::getSmartcardSlots(TQString ProviderLib)
} }
*GetSmartcardSlotsProcess << "-L" ; *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; delete GetSmartcardSlotsProcess;
GetSmartcardCertsFromSlotProcess=0L; GetSmartcardCertsFromSlotProcess=0L;
config->appendLogEntry(i18n("Unable to fetch smartcard slots via pkcs11-tool!"), config->error); config->appendLogEntry(i18n("Unable to fetch smartcard slots via pkcs11-tool!"), config->error);
@ -1137,7 +1137,7 @@ TQStringList Utils::getSmartcardSlots(TQString ProviderLib)
usleep ( 500 ); usleep ( 500 );
config->appPointer->processEvents(); 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; delete GetSmartcardSlotsProcess;
GetSmartcardCertsFromSlotProcess=0L; GetSmartcardCertsFromSlotProcess=0L;
if (config->KvpncDebugLevel > 5) 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); TQString msg_raw = TQString::fromLatin1(buffer, buflen);
if (config->KvpncDebugLevel > 5) if (config->KvpncDebugLevel > 5)

4
src/utils.h
Unescape View File

@ -127,7 +127,7 @@ public slots:
void readStdOutGetNameAndPidOfProgramListen(); void readStdOutGetNameAndPidOfProgramListen();
void readStdErrGetNameAndPidOfProgramListen(); void readStdErrGetNameAndPidOfProgramListen();
void readOutGetEmailAddressOfCert(); void readOutGetEmailAddressOfCert();
void readOutGetSmartcardSlots(KProcess * proc, char * buffer, int buflen); void readOutGetSmartcardSlots(TDEProcess * proc, char * buffer, int buflen);
void readOutGetSmartcardCertsFromSlot(); void readOutGetSmartcardCertsFromSlot();
void readOutGetOpenvpnPkcs11Ids(); void readOutGetOpenvpnPkcs11Ids();
void readOutNeedsPassphrase(); void readOutNeedsPassphrase();
@ -164,7 +164,7 @@ private:
TQProcess *OpenvpnDigestProcess; TQProcess *OpenvpnDigestProcess;
TQProcess *NameAndPidOfProgramListenProcess; TQProcess *NameAndPidOfProgramListenProcess;
TQProcess *GetEmailAddressOfCertProcess; TQProcess *GetEmailAddressOfCertProcess;
KProcess *GetSmartcardSlotsProcess; TDEProcess *GetSmartcardSlotsProcess;
TQProcess *GetSmartcardCertsFromSlotProcess; TQProcess *GetSmartcardCertsFromSlotProcess;
TQProcess *OpenvpnPkcs11IdsProcess; TQProcess *OpenvpnPkcs11IdsProcess;
TQProcess *GetCertsFromCiscoCertStoreProcess; TQProcess *GetCertsFromCiscoCertStoreProcess;

4
src/vpntypesinfodialog.cpp
Unescape View File

@ -102,8 +102,8 @@ VpnTypesInfoDialog::VpnTypesInfoDialog ( KVpncConfig *GlobalConfig, TQWidget *pa
main->textLabel1->setText(i18n("The following information about the VPN tyes has been collected:")); 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 ok_icon = TDEGlobal::iconLoader()->loadIcon( "button_ok", KIcon::NoGroup, 16 );
TQPixmap wrong_icon = KGlobal::iconLoader()->loadIcon( "button_cancel", KIcon::NoGroup, 16 ); TQPixmap wrong_icon = TDEGlobal::iconLoader()->loadIcon( "button_cancel", KIcon::NoGroup, 16 );
ToolInfo *tool=0; ToolInfo *tool=0;
main->InfoListView->setSorting(1); main->InfoListView->setSorting(1);

Write Preview
Loading…
Cancel
Save