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

Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/13/head
Michele Calgaro 11 months ago
parent fdfb4aa064
commit 98f86ddade
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
22 changed files with 854 additions and 854 deletions
Show Stats Download Patch File Download Diff File

4
src/addnetworkroutedialog.cpp
Unescape View File

@ -32,8 +32,8 @@ AddNetworkRouteDialog::AddNetworkRouteDialog(TQWidget *parent, const TQString& c
main = new AddNetworkRouteDialogBase (this); main = new AddNetworkRouteDialogBase (this);
setMainWidget(main); setMainWidget(main);
main->setMinimumSize(main->sizeHint()); main->setMinimumSize(main->sizeHint());
connect(main->UseGatewayCheckBox,TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(useGatewayToggled(bool))); connect(main->UseGatewayCheckBox,TQ_SIGNAL(toggled(bool)),this, TQ_SLOT(useGatewayToggled(bool)));
connect(main->UseInterfaceCheckBox,TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(useInterfaceToggled(bool))); connect(main->UseInterfaceCheckBox,TQ_SIGNAL(toggled(bool)),this, TQ_SLOT(useInterfaceToggled(bool)));
WidgetNotifyHelper h; WidgetNotifyHelper h;
h.setupChangedAction(this); h.setupChangedAction(this);

10
src/advancedsettingsdialog.cpp
Unescape View File

@ -40,11 +40,11 @@ AdvancedSettingsDialog::AdvancedSettingsDialog(TQWidget *parent, const TQString&
this->currentProfile = currentProfile; this->currentProfile = currentProfile;
this->connectionType = connectionType; this->connectionType = connectionType;
connect (main->AdvancedSettingsCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(advancedSettingsToggled(bool))); connect (main->AdvancedSettingsCheckbox, TQ_SIGNAL(toggled(bool)),this, TQ_SLOT(advancedSettingsToggled(bool)));
connect (main->ApplicationVersionCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(applicationVersionToggled(bool))); connect (main->ApplicationVersionCheckbox, TQ_SIGNAL(toggled(bool)),this, TQ_SLOT(applicationVersionToggled(bool)));
connect (main->PerfectForwardSecurityCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(perfectForwardSecurityToggled(bool))); connect (main->PerfectForwardSecurityCheckbox, TQ_SIGNAL(toggled(bool)),this, TQ_SLOT(perfectForwardSecurityToggled(bool)));
connect (main->IkeGroupCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(IkeGroupToggled(bool))); connect (main->IkeGroupCheckbox, TQ_SIGNAL(toggled(bool)),this, TQ_SLOT(IkeGroupToggled(bool)));
connect (main->SingleDesCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(singleDesToggled(bool))); connect (main->SingleDesCheckbox, TQ_SIGNAL(toggled(bool)),this, TQ_SLOT(singleDesToggled(bool)));
main->IkeGroupCheckbox->setEnabled( false ); main->IkeGroupCheckbox->setEnabled( false );
main->PerfectForwardSecrecyCombobox->setEnabled( false ); main->PerfectForwardSecrecyCombobox->setEnabled( false );

38
src/ciscocertificateenrollment.cpp
Unescape View File

@ -90,7 +90,7 @@ void CiscoCertificateEnrollment::reject()
if ( EnrollmentProcess != 0 && EnrollmentProcess->isRunning() ) if ( EnrollmentProcess != 0 && EnrollmentProcess->isRunning() )
{ {
EnrollmentProcess->tryTerminate(); EnrollmentProcess->tryTerminate();
TQTimer::singleShot ( 2000, EnrollmentProcess, TQT_SLOT ( kill() ) ); TQTimer::singleShot ( 2000, EnrollmentProcess, TQ_SLOT ( kill() ) );
if ( GlobalConfig->KvpncDebugLevel > 2 ) if ( GlobalConfig->KvpncDebugLevel > 2 )
GlobalConfig->appendLogEntry ( i18n ( "process %1 killed" ).arg ( "cisco_cert_mgr" ), GlobalConfig->debug ); GlobalConfig->appendLogEntry ( i18n ( "process %1 killed" ).arg ( "cisco_cert_mgr" ), GlobalConfig->debug );
@ -106,8 +106,8 @@ void CiscoCertificateEnrollment::setupPages()
selectionpage->sizeHint(); selectionpage->sizeHint();
addPage ( selectionpage, "<b>" + i18n ( "Select enrollment type..." ) + "</b>" ); addPage ( selectionpage, "<b>" + i18n ( "Select enrollment type..." ) + "</b>" );
connect ( selectionpage->FileEnrollementRadioButton, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( enrollmentToggled ( bool ) ) ); connect ( selectionpage->FileEnrollementRadioButton, TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( enrollmentToggled ( bool ) ) );
connect ( selectionpage->OnlineEnrollementRadioButton, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( enrollmentToggled ( bool ) ) ); connect ( selectionpage->OnlineEnrollementRadioButton, TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( enrollmentToggled ( bool ) ) );
GlobalConfig->slotStatusMsg(i18n("Collecting cisco CA certs from Cisco certificate store..."), ID_STATUS_MSG); GlobalConfig->slotStatusMsg(i18n("Collecting cisco CA certs from Cisco certificate store..."), ID_STATUS_MSG);
if (GlobalConfig->KvpncDebugLevel > 2) if (GlobalConfig->KvpncDebugLevel > 2)
@ -373,9 +373,9 @@ void CiscoCertificateEnrollment::next ()
} }
connect ( EnrollmentProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout() ) ); connect ( EnrollmentProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout() ) );
connect ( EnrollmentProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr() ) ); connect ( EnrollmentProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr() ) );
connect ( EnrollmentProcess, TQT_SIGNAL ( processExited()) , this, TQT_SLOT(enrollmentProcessFinished())); connect ( EnrollmentProcess, TQ_SIGNAL ( processExited()) , this, TQ_SLOT(enrollmentProcessFinished()));
// if ( GlobalConfig->KvpncDebugLevel > 3 ) // if ( GlobalConfig->KvpncDebugLevel > 3 )
{ {
@ -410,7 +410,7 @@ void CiscoCertificateEnrollment::next ()
ProgressDlg->show(); ProgressDlg->show();
ProgressDlg->resize ( ProgressDlg->width() +100,ProgressDlg->height() ); ProgressDlg->resize ( ProgressDlg->width() +100,ProgressDlg->height() );
connect ( &CheckEnrollmentTimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( checkProgress() ) ); connect ( &CheckEnrollmentTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( checkProgress() ) );
CheckEnrollmentTimer.start ( 500, FALSE ); CheckEnrollmentTimer.start ( 500, FALSE );
// we stupid have to send the password :( // we stupid have to send the password :(
@ -483,9 +483,9 @@ void CiscoCertificateEnrollment::showPage ( TQWidget* page )
void CiscoCertificateEnrollment::enrollmentProcessFinished() void CiscoCertificateEnrollment::enrollmentProcessFinished()
{ {
disconnect ( EnrollmentProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout() ) ); disconnect ( EnrollmentProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout() ) );
disconnect ( EnrollmentProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr() ) ); disconnect ( EnrollmentProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr() ) );
disconnect ( EnrollmentProcess, TQT_SIGNAL ( processExited()) , this, TQT_SLOT(enrollmentProcessFinished())); disconnect ( EnrollmentProcess, TQ_SIGNAL ( processExited()) , this, TQ_SLOT(enrollmentProcessFinished()));
if ( ProgressDlg!= 0 ) if ( ProgressDlg!= 0 )
ProgressDlg->progressBar()->setValue ( 100 ); ProgressDlg->progressBar()->setValue ( 100 );
GlobalConfig->appPointer->restoreOverrideCursor(); GlobalConfig->appPointer->restoreOverrideCursor();
@ -633,12 +633,12 @@ void CiscoCertificateEnrollment::checkProgress()
CheckEnrollmentTimer.stop(); CheckEnrollmentTimer.stop();
// kill process // kill process
disconnect ( EnrollmentProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout() ) ); disconnect ( EnrollmentProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout() ) );
disconnect ( EnrollmentProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr() ) ); disconnect ( EnrollmentProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr() ) );
if ( EnrollmentProcess->isRunning() ) if ( EnrollmentProcess->isRunning() )
{ {
EnrollmentProcess->tryTerminate(); EnrollmentProcess->tryTerminate();
TQTimer::singleShot ( 2000, EnrollmentProcess, TQT_SLOT ( kill() ) ); TQTimer::singleShot ( 2000, EnrollmentProcess, TQ_SLOT ( kill() ) );
if ( GlobalConfig->KvpncDebugLevel > 2 ) if ( GlobalConfig->KvpncDebugLevel > 2 )
GlobalConfig->appendLogEntry ( i18n ( "process %1 killed" ).arg ( "cisco_cert_mgr" ), GlobalConfig->debug ); GlobalConfig->appendLogEntry ( i18n ( "process %1 killed" ).arg ( "cisco_cert_mgr" ), GlobalConfig->debug );
@ -662,9 +662,9 @@ void CiscoCertificateEnrollment::checkProgress()
DeleteProcess->addArgument ( "delete" ); DeleteProcess->addArgument ( "delete" );
DeleteProcess->addArgument ( "-ct" ); DeleteProcess->addArgument ( "-ct" );
DeleteProcess->addArgument ( 0 ); DeleteProcess->addArgument ( 0 );
connect ( DeleteProcess, TQT_SIGNAL ( processExited()) , this, TQT_SLOT(cancelProcessFinished())); connect ( DeleteProcess, TQ_SIGNAL ( processExited()) , this, TQ_SLOT(cancelProcessFinished()));
connect ( DeleteProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_cancel() ) ); connect ( DeleteProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_cancel() ) );
connect ( DeleteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_cancel() ) ); connect ( DeleteProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_cancel() ) );
if ( !DeleteProcess->start ( env ) ) if ( !DeleteProcess->start ( env ) )
{ {
@ -685,9 +685,9 @@ void CiscoCertificateEnrollment::checkProgress()
sleep(1); sleep(1);
} }
} }
disconnect ( DeleteProcess, TQT_SIGNAL ( processExited()) , this, TQT_SLOT(cancelProcessFinished())); disconnect ( DeleteProcess, TQ_SIGNAL ( processExited()) , this, TQ_SLOT(cancelProcessFinished()));
disconnect ( DeleteProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_cancel() ) ); disconnect ( DeleteProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_cancel() ) );
disconnect ( DeleteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_cancel() ) ); disconnect ( DeleteProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_cancel() ) );
delete DeleteProcess; delete DeleteProcess;
DeleteProcess=0L; DeleteProcess=0L;

10
src/configconnectoptions.cpp
Unescape View File

@ -28,13 +28,13 @@ ConfigConnectOptions::ConfigConnectOptions(TQWidget *parent) : ConfigConnectOpti
dialogModified=false; dialogModified=false;
// connect changed signals to own signal // connect changed signals to own signal
connect(AutoConnectProfileComboBox,TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SIGNAL(changed())); connect(AutoConnectProfileComboBox,TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SIGNAL(changed()));
connect(checkMinimizeAfterConnectCheck,TQT_SIGNAL(stateChanged ( int )),this,TQT_SIGNAL(changed())); connect(checkMinimizeAfterConnectCheck,TQ_SIGNAL(stateChanged ( int )),this,TQ_SIGNAL(changed()));
connect(SilentQuitcheckBox,TQT_SIGNAL(stateChanged ( int )),this,TQT_SIGNAL(changed())); connect(SilentQuitcheckBox,TQ_SIGNAL(stateChanged ( int )),this,TQ_SIGNAL(changed()));
connect(DoAutoConnectCheckBox,TQT_SIGNAL(stateChanged ( int )),this,TQT_SIGNAL(changed())); connect(DoAutoConnectCheckBox,TQ_SIGNAL(stateChanged ( int )),this,TQ_SIGNAL(changed()));
// connect changed to slot // connect changed to slot
connect(this,TQT_SIGNAL(changed ()),this,TQT_SLOT(dialogChanged())); connect(this,TQ_SIGNAL(changed ()),this,TQ_SLOT(dialogChanged()));
} }

6
src/debugoutputtextedit.cpp
Unescape View File

@ -40,10 +40,10 @@ DebugOutputTextEdit::~DebugOutputTextEdit()
TQPopupMenu* DebugOutputTextEdit::createPopupMenu(const TQPoint &) TQPopupMenu* DebugOutputTextEdit::createPopupMenu(const TQPoint &)
{ {
popup = new TQPopupMenu(this); popup = new TQPopupMenu(this);
popup->insertItem(i18n("Cut Content"), this, TQT_SLOT(cut() ) ); popup->insertItem(i18n("Cut Content"), this, TQ_SLOT(cut() ) );
popup->insertItem(i18n("Copy Content"), this, TQT_SLOT(copy() ) ); popup->insertItem(i18n("Copy Content"), this, TQ_SLOT(copy() ) );
popup->insertSeparator(); popup->insertSeparator();
popup->insertItem(i18n("Clear Log Window"), this, TQT_SLOT(clear() ) ); popup->insertItem(i18n("Clear Log Window"), this, TQ_SLOT(clear() ) );
popup->insertSeparator(); popup->insertSeparator();
return popup; return popup;

8
src/generateopenvpnkeydialog.cpp
Unescape View File

@ -88,8 +88,8 @@ void GenerateOpenvpnKeyDialog::canAccept()
generateOpenvpnKeyProcess->addArgument("--secret"); generateOpenvpnKeyProcess->addArgument("--secret");
generateOpenvpnKeyProcess->addArgument(filename); generateOpenvpnKeyProcess->addArgument(filename);
connect( generateOpenvpnKeyProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErr() ) ); connect( generateOpenvpnKeyProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErr() ) );
connect( generateOpenvpnKeyProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdErr() ) ); connect( generateOpenvpnKeyProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdErr() ) );
if ( !generateOpenvpnKeyProcess->start(env) ) if ( !generateOpenvpnKeyProcess->start(env) )
{ {
KMessageBox::sorry( this, i18n( "Generating of %1 key failed!" ).arg( "openvpn" ) ); KMessageBox::sorry( this, i18n( "Generating of %1 key failed!" ).arg( "openvpn" ) );
@ -105,8 +105,8 @@ void GenerateOpenvpnKeyDialog::canAccept()
{ {
sleep(1); sleep(1);
} }
disconnect( generateOpenvpnKeyProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErr() ) ); disconnect( generateOpenvpnKeyProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErr() ) );
disconnect( generateOpenvpnKeyProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdErr() ) ); disconnect( generateOpenvpnKeyProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdErr() ) );
delete generateOpenvpnKeyProcess; delete generateOpenvpnKeyProcess;
generateOpenvpnKeyProcess = 0L; generateOpenvpnKeyProcess = 0L;
if (genOk) if (genOk)

42
src/importcertificatedialog.cpp
Unescape View File

@ -70,10 +70,10 @@ ImportCertificateDialog::ImportCertificateDialog ( TQWidget *parent, const char*
env = new TQStringList(); env = new TQStringList();
*env << "LC_ALL=C" << "LANG=C" << "PATH=/bin:/usr/bin:/usr/sbin:/sbin"; *env << "LC_ALL=C" << "LANG=C" << "PATH=/bin:/usr/bin:/usr/sbin:/sbin";
connect ( main->ImporttypeComboBox, TQT_SIGNAL ( activated ( int ) ), this, TQT_SLOT ( typeToggeled ( int ) ) ); connect ( main->ImporttypeComboBox, TQ_SIGNAL ( activated ( int ) ), this, TQ_SLOT ( typeToggeled ( int ) ) );
typeToggeled ( main->ImporttypeComboBox->currentItem() ); typeToggeled ( main->ImporttypeComboBox->currentItem() );
connect (main->UsePrivateKeyPasswordCheckBox, TQT_SIGNAL( toggled(bool)), this, TQT_SLOT(usePrivateKeyPassToggled(bool))); connect (main->UsePrivateKeyPasswordCheckBox, TQ_SIGNAL( toggled(bool)), this, TQ_SLOT(usePrivateKeyPassToggled(bool)));
usePrivateKeyPassToggled(main->UsePrivateKeyPasswordCheckBox->isChecked()); usePrivateKeyPassToggled(main->UsePrivateKeyPasswordCheckBox->isChecked());
// TMP // TMP
@ -451,23 +451,23 @@ void ImportCertificateDialog::accept()
} }
connect ( ImportProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_import() ) ); connect ( ImportProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_import() ) );
connect ( ImportProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_import() ) ); connect ( ImportProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_import() ) );
if ( main->ImporttypeComboBox->currentItem() == pkcs12_freeswan || if ( main->ImporttypeComboBox->currentItem() == pkcs12_freeswan ||
main->ImporttypeComboBox->currentItem() == pkcs12_racoon || main->ImporttypeComboBox->currentItem() == pkcs12_racoon ||
main->ImporttypeComboBox->currentItem() == pkcs12_openvpn main->ImporttypeComboBox->currentItem() == pkcs12_openvpn
) )
{ {
connect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doCacert() ) ); connect ( ImportProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( doCacert() ) );
} }
if ( main->ImporttypeComboBox->currentItem() == ca_der ) if ( main->ImporttypeComboBox->currentItem() == ca_der )
{ {
connect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doCreateHash() ) ); connect ( ImportProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( doCreateHash() ) );
} }
if ( main->ImporttypeComboBox->currentItem() == cisco || main->ImporttypeComboBox->currentItem() == ciscoca) if ( main->ImporttypeComboBox->currentItem() == cisco || main->ImporttypeComboBox->currentItem() == ciscoca)
{ {
connect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( ciscoCertMgrExited() ) ); connect ( ImportProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( ciscoCertMgrExited() ) );
} }
if ( !ImportProcess->start ( env ) ) if ( !ImportProcess->start ( env ) )
@ -640,7 +640,7 @@ void ImportCertificateDialog::reject()
void ImportCertificateDialog::doCacert() void ImportCertificateDialog::doCacert()
{ {
disconnect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doCacert() ) ); disconnect ( ImportProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( doCacert() ) );
if ( GlobalConfig->KvpncDebugLevel > 3 ) if ( GlobalConfig->KvpncDebugLevel > 3 )
GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).arg("doCacert()"),GlobalConfig->debug ); GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).arg("doCacert()"),GlobalConfig->debug );
@ -681,7 +681,7 @@ void ImportCertificateDialog::doCacert()
ImportProcess->addArgument ( "-nodes" ); ImportProcess->addArgument ( "-nodes" );
connect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doCreateHash() ) ); connect ( ImportProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( doCreateHash() ) );
if ( ! ImportProcess->start ( env ) ) if ( ! ImportProcess->start ( env ) )
{ {
@ -719,7 +719,7 @@ void ImportCertificateDialog::doPrivateKey()
if ( GlobalConfig->KvpncDebugLevel > 3 ) if ( GlobalConfig->KvpncDebugLevel > 3 )
GlobalConfig->appendLogEntry ( "[dbg]: doPrivateKey()",GlobalConfig->debug ); GlobalConfig->appendLogEntry ( "[dbg]: doPrivateKey()",GlobalConfig->debug );
disconnect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doPrivateKey() ) ); disconnect ( ImportProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( doPrivateKey() ) );
if ( ImportProcess->normalExit () ) if ( ImportProcess->normalExit () )
{ {
@ -748,9 +748,9 @@ void ImportCertificateDialog::doPrivateKey()
CertFullPath=certpath+"/" + certName + ".pem"; CertFullPath=certpath+"/" + certName + ".pem";
if ( main->UsePrivateKeyPasswordCheckBox->isChecked() ) if ( main->UsePrivateKeyPasswordCheckBox->isChecked() )
connect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( exit() ) ); connect ( ImportProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( exit() ) );
else else
connect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( removePrivateKey() ) ); connect ( ImportProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( removePrivateKey() ) );
//LogOutput->append( "priv key: we starting..." ); //LogOutput->append( "priv key: we starting..." );
if ( !ImportProcess->start( ) ) if ( !ImportProcess->start( ) )
@ -823,7 +823,7 @@ void ImportCertificateDialog::doPrivateKey()
void ImportCertificateDialog::doCreateHash() void ImportCertificateDialog::doCreateHash()
{ {
disconnect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doCreateHash() ) ); disconnect ( ImportProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( doCreateHash() ) );
if ( GlobalConfig->KvpncDebugLevel > 3 ) if ( GlobalConfig->KvpncDebugLevel > 3 )
GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).arg("doCreateHash()"),GlobalConfig->debug ); GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).arg("doCreateHash()"),GlobalConfig->debug );
@ -850,7 +850,7 @@ void ImportCertificateDialog::doCreateHash()
else else
ImportProcess->addArgument ( certpath + "/ca_" + certName + ".pem" ); ImportProcess->addArgument ( certpath + "/ca_" + certName + ".pem" );
connect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doLink() ) ); connect ( ImportProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( doLink() ) );
// LogOutput->append( "hash: we starting..." ); // LogOutput->append( "hash: we starting..." );
@ -892,7 +892,7 @@ void ImportCertificateDialog::doCreateHash()
void ImportCertificateDialog::doLink() void ImportCertificateDialog::doLink()
{ {
disconnect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doLink() ) ); disconnect ( ImportProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( doLink() ) );
if ( GlobalConfig->KvpncDebugLevel > 3 ) if ( GlobalConfig->KvpncDebugLevel > 3 )
GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).arg("doLink()"),GlobalConfig->debug ); GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).arg("doLink()"),GlobalConfig->debug );
@ -919,9 +919,9 @@ void ImportCertificateDialog::doLink()
if ( main->ImporttypeComboBox->currentItem() == pkcs12_freeswan || if ( main->ImporttypeComboBox->currentItem() == pkcs12_freeswan ||
main->ImporttypeComboBox->currentItem() == pkcs12_openvpn ) main->ImporttypeComboBox->currentItem() == pkcs12_openvpn )
connect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( doPrivateKey() ) ); connect ( ImportProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( doPrivateKey() ) );
else else
connect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( exit() ) ); connect ( ImportProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( exit() ) );
if ( !ImportProcess->start( ) ) if ( !ImportProcess->start( ) )
@ -1120,8 +1120,8 @@ void ImportCertificateDialog::readFromStderr_import()
error_found=true; error_found=true;
// if ( ImportProcess != 0L && ImportProcess->isRunning() ) // if ( ImportProcess != 0L && ImportProcess->isRunning() )
// { // {
// disconnect ( ImportProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_import() ) ); // disconnect ( ImportProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_import() ) );
// disconnect ( ImportProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_import() ) ); // disconnect ( ImportProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_import() ) );
// ImportProcess->kill(); // ImportProcess->kill();
// ImportProcess = 0L; // ImportProcess = 0L;
// } // }
@ -1311,7 +1311,7 @@ void ImportCertificateDialog::usePrivateKeyPassToggled(bool)
void ImportCertificateDialog::removePrivateKey() void ImportCertificateDialog::removePrivateKey()
{ {
disconnect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( removePrivateKey() ) ); disconnect ( ImportProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( removePrivateKey() ) );
if ( GlobalConfig->KvpncDebugLevel > 3 ) if ( GlobalConfig->KvpncDebugLevel > 3 )
GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).arg("removePrivateKey()"),GlobalConfig->debug ); GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1" ).arg("removePrivateKey()"),GlobalConfig->debug );
@ -1334,7 +1334,7 @@ void ImportCertificateDialog::removePrivateKey()
else if ( main->ImporttypeComboBox->currentItem() == pkcs12_openvpn ) else if ( main->ImporttypeComboBox->currentItem() == pkcs12_openvpn )
ImportProcess->addArgument ( certpath+"/" + certName + ".pem" ); // warning: static ImportProcess->addArgument ( certpath+"/" + certName + ".pem" ); // warning: static
connect ( ImportProcess, TQT_SIGNAL ( processExited () ), this, TQT_SLOT ( exit() ) ); connect ( ImportProcess, TQ_SIGNAL ( processExited () ), this, TQ_SLOT ( exit() ) );
if ( !ImportProcess->start( ) ) if ( !ImportProcess->start( ) )

20
src/kfeedback.cpp
Unescape View File

@ -47,17 +47,17 @@ KFeedbackDialog::KFeedbackDialog( const TQString & feedbackMailAddress,
layout->addWidget( _form ); layout->addWidget( _form );
checkSendButton(); checkSendButton();
connect( this, TQT_SIGNAL( applyClicked() ), connect( this, TQ_SIGNAL( applyClicked() ),
_form, TQT_SLOT ( sendMail() ) ); _form, TQ_SLOT ( sendMail() ) );
connect( _form, TQT_SIGNAL( mailSent() ), connect( _form, TQ_SIGNAL( mailSent() ),
this, TQT_SLOT ( hide() ) ); this, TQ_SLOT ( hide() ) );
connect( _form, TQT_SIGNAL( mailSent() ), connect( _form, TQ_SIGNAL( mailSent() ),
this, TQT_SIGNAL( mailSent() ) ); this, TQ_SIGNAL( mailSent() ) );
connect( _form, TQT_SIGNAL( checkComplete() ), connect( _form, TQ_SIGNAL( checkComplete() ),
this, TQT_SLOT ( checkSendButton() ) ); this, TQ_SLOT ( checkSendButton() ) );
} }
@ -98,8 +98,8 @@ KFeedbackForm::KFeedbackForm( const TQString & feedbackMailAddress,
_questionList = new KFeedbackQuestionList( this ); _questionList = new KFeedbackQuestionList( this );
TQ_CHECK_PTR( _questionList ); TQ_CHECK_PTR( _questionList );
connect( _questionList, TQT_SIGNAL( checkComplete() ), connect( _questionList, TQ_SIGNAL( checkComplete() ),
this, TQT_SLOT ( slotCheckComplete() ) ); this, TQ_SLOT ( slotCheckComplete() ) );
// //

1016
src/kvpnc.cpp
View File

File diff suppressed because it is too large Load Diff

2
src/kvpncimportprofileselectiondialog.cpp
Unescape View File

@ -25,7 +25,7 @@
KvpncImportProfileSelectionDialog::KvpncImportProfileSelectionDialog() KvpncImportProfileSelectionDialog::KvpncImportProfileSelectionDialog()
{ {
allSelected = false; allSelected = false;
connect (ToggleAllPushButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(importAllToggled())); connect (ToggleAllPushButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(importAllToggled()));
} }

2
src/kvpnckicker.cpp
Unescape View File

@ -35,7 +35,7 @@ KVpncKicker::KVpncKicker( KVpncConfig *GlobalConfig,TQWidget* parent, const char
TDEAction *quit = actionCollection()->action( "file_quit" ); TDEAction *quit = actionCollection()->action( "file_quit" );
quit->disconnect(); quit->disconnect();
KVpnc *myParent = static_cast<KVpnc *>( parent ); KVpnc *myParent = static_cast<KVpnc *>( parent );
connect( quit, TQT_SIGNAL( activated() ), myParent, TQT_SLOT( quitCalledKicker() ) ); connect( quit, TQ_SIGNAL( activated() ), myParent, TQ_SLOT( quitCalledKicker() ) );
show(); show();
} }

4
src/logviewerdialog.cpp
Unescape View File

@ -56,8 +56,8 @@ KDialogBase::Ok|KDialogBase::Cancel,KDialogBase::Ok, true )
// InfoListView->setSorting(1); // InfoListView->setSorting(1);
connect (main->LineCountApplyPushButton,TQT_SIGNAL(clicked()),this, TQT_SLOT(updateLineCountClicked())); connect (main->LineCountApplyPushButton,TQ_SIGNAL(clicked()),this, TQ_SLOT(updateLineCountClicked()));
connect (main->FindPushButton,TQT_SIGNAL(clicked()),this, TQT_SLOT(findLogEntryClicked())); connect (main->FindPushButton,TQ_SIGNAL(clicked()),this, TQ_SLOT(findLogEntryClicked()));
TQApplication::setOverrideCursor( TQCursor(TQt::WaitCursor) ); TQApplication::setOverrideCursor( TQCursor(TQt::WaitCursor) );
parseLog(); parseLog();

32
src/manageciscocert.cpp
Unescape View File

@ -48,9 +48,9 @@ ManageCiscoCert::ManageCiscoCert(TQWidget *parent, const char* caption, KVpncCon
sizeHint(); sizeHint();
this->GlobalConfig = GlobalConfig; this->GlobalConfig = GlobalConfig;
connect (main->ImportCertFilePushButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(importCertClicked())); connect (main->ImportCertFilePushButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(importCertClicked()));
connect (main->DeleteCertPushButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(deleteCertClicked())); connect (main->DeleteCertPushButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(deleteCertClicked()));
connect (main->CertListView,TQT_SIGNAL(contextMenuRequested ( TQListViewItem *, const TQPoint &, int )),this,TQT_SLOT(contextMenuRequested ( TQListViewItem *, const TQPoint &, int ))); connect (main->CertListView,TQ_SIGNAL(contextMenuRequested ( TQListViewItem *, const TQPoint &, int )),this,TQ_SLOT(contextMenuRequested ( TQListViewItem *, const TQPoint &, int )));
checkList(); checkList();
} }
@ -85,9 +85,9 @@ void ManageCiscoCert::deleteCertClicked()
DeleteProcess->addArgument ( "-ct" ); DeleteProcess->addArgument ( "-ct" );
DeleteProcess->addArgument ( item->text(0) ); DeleteProcess->addArgument ( item->text(0) );
connect ( DeleteProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_remove() ) ); connect ( DeleteProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_remove() ) );
connect ( DeleteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_remove() ) ); connect ( DeleteProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_remove() ) );
connect ( DeleteProcess, TQT_SIGNAL ( processExited()) , this, TQT_SLOT(deleteProcessFinished())); connect ( DeleteProcess, TQ_SIGNAL ( processExited()) , this, TQ_SLOT(deleteProcessFinished()));
TQStringList *env = new TQStringList(); TQStringList *env = new TQStringList();
*env << "LC_ALL=C" << "LANG=C" << "PATH=/bin:/usr/bin:/usr/sbin:/sbin"; *env << "LC_ALL=C" << "LANG=C" << "PATH=/bin:/usr/bin:/usr/sbin:/sbin";
@ -119,9 +119,9 @@ void ManageCiscoCert::deleteCertClicked()
} }
checkList(); checkList();
disconnect ( DeleteProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_remove() ) ); disconnect ( DeleteProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_remove() ) );
disconnect ( DeleteProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_remove() ) ); disconnect ( DeleteProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_remove() ) );
disconnect ( DeleteProcess, TQT_SIGNAL ( processExited()) , this, TQT_SLOT(deleteProcessFinished())); disconnect ( DeleteProcess, TQ_SIGNAL ( processExited()) , this, TQ_SLOT(deleteProcessFinished()));
delete DeleteProcess; delete DeleteProcess;
DeleteProcess=0L; DeleteProcess=0L;
} }
@ -182,9 +182,9 @@ void ManageCiscoCert::showCertClicked()
ShowProcess->addArgument ( "-ct" ); ShowProcess->addArgument ( "-ct" );
ShowProcess->addArgument ( item->text(0) ); ShowProcess->addArgument ( item->text(0) );
connect ( ShowProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_display() ) ); connect ( ShowProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_display() ) );
connect ( ShowProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_display() ) ); connect ( ShowProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_display() ) );
connect ( ShowProcess, TQT_SIGNAL ( processExited()) , this, TQT_SLOT(showProcessFinished())); connect ( ShowProcess, TQ_SIGNAL ( processExited()) , this, TQ_SLOT(showProcessFinished()));
TQStringList *env = new TQStringList(); TQStringList *env = new TQStringList();
*env << "LC_ALL=C" << "LANG=C" << "PATH=/bin:/usr/bin:/usr/sbin:/sbin"; *env << "LC_ALL=C" << "LANG=C" << "PATH=/bin:/usr/bin:/usr/sbin:/sbin";
@ -206,9 +206,9 @@ void ManageCiscoCert::showCertClicked()
GlobalConfig->appPointer->processEvents(); GlobalConfig->appPointer->processEvents();
} }
} }
disconnect ( ShowProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_display() ) ); disconnect ( ShowProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_display() ) );
disconnect ( ShowProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_display() ) ); disconnect ( ShowProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readFromStderr_display() ) );
disconnect ( ShowProcess, TQT_SIGNAL ( processExited()) , this, TQT_SLOT(showProcessFinished())); disconnect ( ShowProcess, TQ_SIGNAL ( processExited()) , this, TQ_SLOT(showProcessFinished()));
} }
} }
@ -365,7 +365,7 @@ void ManageCiscoCert::contextMenuRequested ( TQListViewItem * item, const TQPoin
ContextMenu->insertItem(i18n("&Delete...")); ContextMenu->insertItem(i18n("&Delete..."));
} }
ContextMenu->insertItem(i18n("&Add...")); ContextMenu->insertItem(i18n("&Add..."));
connect ( ContextMenu, TQT_SIGNAL ( activated ( int ) ), this, TQT_SLOT ( doContextMenuAction ( int ) ) ); connect ( ContextMenu, TQ_SIGNAL ( activated ( int ) ), this, TQ_SLOT ( doContextMenuAction ( int ) ) );
ContextMenu->show(); ContextMenu->show();
ContextMenu->setGeometry(pos.x(),pos.y(), ContextMenu->width(),ContextMenu->height()); ContextMenu->setGeometry(pos.x(),pos.y(), ContextMenu->width(),ContextMenu->height());
} }

26
src/networkinterface.cpp
Unescape View File

@ -154,9 +154,9 @@ TQString NetworkInterface::getInterfaceIP2( TQString Interface )
retrieveInterfaceIP=true; retrieveInterfaceIP=true;
readOutput=true; readOutput=true;
connect( InterfaceIpProc, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_interfaceip() ) ); connect( InterfaceIpProc, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readFromStdout_interfaceip() ) );
connect( InterfaceIpProc, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_interfaceip() ) ); connect( InterfaceIpProc, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readFromStderr_interfaceip() ) );
connect( InterfaceIpProc, TQT_SIGNAL( processExited () ), this, TQT_SLOT( processHasFinished() ) ); connect( InterfaceIpProc, TQ_SIGNAL( processExited () ), this, TQ_SLOT( processHasFinished() ) );
if ( !InterfaceIpProc->start(env) ) if ( !InterfaceIpProc->start(env) )
{ {
@ -174,9 +174,9 @@ TQString NetworkInterface::getInterfaceIP2( TQString Interface )
while ( readOutput) while ( readOutput)
GlobalConfig->appPointer->processEvents();*/ GlobalConfig->appPointer->processEvents();*/
} }
disconnect( InterfaceIpProc, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_interfaceip() ) ); disconnect( InterfaceIpProc, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readFromStdout_interfaceip() ) );
disconnect( InterfaceIpProc, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_interfaceip() ) ); disconnect( InterfaceIpProc, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readFromStderr_interfaceip() ) );
disconnect( InterfaceIpProc, TQT_SIGNAL( processExited () ), this, TQT_SLOT( processHasFinished() ) ); disconnect( InterfaceIpProc, TQ_SIGNAL( processExited () ), this, TQ_SLOT( processHasFinished() ) );
delete InterfaceIpProc; delete InterfaceIpProc;
InterfaceIpProc=0L; InterfaceIpProc=0L;
} }
@ -213,9 +213,9 @@ TQString NetworkInterface::getInterfaceAddress( TQString IPforInterface )
retrieveInterfaceAddress=true; retrieveInterfaceAddress=true;
readOutput=true; readOutput=true;
//connect( InterfaceAddressProc, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_interfaceaddress() ) ); //connect( InterfaceAddressProc, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readFromStdout_interfaceaddress() ) );
// connect( InterfaceAddressProc, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_interfaceaddress() ) ); // connect( InterfaceAddressProc, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readFromStderr_interfaceaddress() ) );
connect( InterfaceAddressProc, TQT_SIGNAL( processExited () ), this, TQT_SLOT( processHasFinished() ) ); connect( InterfaceAddressProc, TQ_SIGNAL( processExited () ), this, TQ_SLOT( processHasFinished() ) );
if ( !InterfaceAddressProc->start(env) ) if ( !InterfaceAddressProc->start(env) )
@ -237,9 +237,9 @@ TQString NetworkInterface::getInterfaceAddress( TQString IPforInterface )
// GlobalConfig->appPointer->processEvents(); // GlobalConfig->appPointer->processEvents();
} }
// disconnect( InterfaceAddressProc, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readFromStdout_interfaceaddress() ) ); // disconnect( InterfaceAddressProc, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readFromStdout_interfaceaddress() ) );
// disconnect( InterfaceAddressProc, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readFromStderr_interfaceaddress() ) ); // disconnect( InterfaceAddressProc, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readFromStderr_interfaceaddress() ) );
disconnect( InterfaceAddressProc, TQT_SIGNAL( processExited () ), this, TQT_SLOT( processHasFinished() ) ); disconnect( InterfaceAddressProc, TQ_SIGNAL( processExited () ), this, TQ_SLOT( processHasFinished() ) );
//delete InterfaceAddressProc; //delete InterfaceAddressProc;
} }
} }
@ -409,7 +409,7 @@ TQString NetworkInterface::getExternalIpAddress()
ExternalIpAddress=""; ExternalIpAddress="";
getExternalIpAddressRunning=true; getExternalIpAddressRunning=true;
http = new TQHttp(); http = new TQHttp();
connect (http,TQT_SIGNAL(readyRead(const TQHttpResponseHeader &)), this, TQT_SLOT(externalIpDataRecieved(const TQHttpResponseHeader &))); connect (http,TQ_SIGNAL(readyRead(const TQHttpResponseHeader &)), this, TQ_SLOT(externalIpDataRecieved(const TQHttpResponseHeader &)));
// FIXME how it could be better? // FIXME how it could be better?
http->setHost( "checkip.dyndns.org" ); http->setHost( "checkip.dyndns.org" );

16
src/newprofiledialog.cpp
Unescape View File

@ -53,14 +53,14 @@ NewProfileDialog::NewProfileDialog( TQApplication *app,TQWidget *parent, const T
setMainWidget(main); setMainWidget(main);
main->setMinimumSize(main->sizeHint()); main->setMinimumSize(main->sizeHint());
connect( main->ConnectionTypeComboBox, TQT_SIGNAL( activated( const TQString& ) ), this, TQT_SLOT( connectiontypeChanged( const TQString& ) ) ); connect( main->ConnectionTypeComboBox, TQ_SIGNAL( activated( const TQString& ) ), this, TQ_SLOT( connectiontypeChanged( const TQString& ) ) );
connect( main->AuthTypeComboBox , TQT_SIGNAL( activated( const TQString& ) ), this, TQT_SLOT( authTypeChanged( const TQString& ) ) ); connect( main->AuthTypeComboBox , TQ_SIGNAL( activated( const TQString& ) ), this, TQ_SLOT( authTypeChanged( const TQString& ) ) );
// connect( main->buttonCancel , TQT_SIGNAL( clicked () ), this, TQT_SLOT( reject() ) ); // connect( main->buttonCancel , TQ_SIGNAL( clicked () ), this, TQ_SLOT( reject() ) );
connect( main->ImportCertificatePushButton, TQT_SIGNAL( clicked () ), this, TQT_SLOT( importCertificate() ) ); connect( main->ImportCertificatePushButton, TQ_SIGNAL( clicked () ), this, TQ_SLOT( importCertificate() ) );
connect( main->AdvancedSettingsPushButton, TQT_SIGNAL( clicked () ), this, TQT_SLOT( advancedSettingsClicked() ) ); connect( main->AdvancedSettingsPushButton, TQ_SIGNAL( clicked () ), this, TQ_SLOT( advancedSettingsClicked() ) );
connect( main->ImportPcfProfilePushButton , TQT_SIGNAL( clicked () ), this, TQT_SLOT( importPcfFileClicked() ) ); connect( main->ImportPcfProfilePushButton , TQ_SIGNAL( clicked () ), this, TQ_SLOT( importPcfFileClicked() ) );
connect( main->GroupPasswordEdit, TQT_SIGNAL( textChanged(const TQString&) ), this, TQT_SLOT( groupPasswordContentChanged() ) ); connect( main->GroupPasswordEdit, TQ_SIGNAL( textChanged(const TQString&) ), this, TQ_SLOT( groupPasswordContentChanged() ) );
connect( main->PasswordEdit, TQT_SIGNAL( textChanged(const TQString&) ), this, TQT_SLOT( passwordContentChanged() ) ); connect( main->PasswordEdit, TQ_SIGNAL( textChanged(const TQString&) ), this, TQ_SLOT( passwordContentChanged() ) );
newProfileCreated = FALSE; newProfileCreated = FALSE;
Name = ""; Name = "";

96
src/newprofilewizard.cpp
Unescape View File

@ -209,7 +209,7 @@ void NewProfileWizard::setupPages()
newprofilewizardciscomanuallypagecontent = new NewProfileWizardCiscoManually ( newprofilewizardciscomanuallypage ); newprofilewizardciscomanuallypagecontent = new NewProfileWizardCiscoManually ( newprofilewizardciscomanuallypage );
newprofilewizardciscomanuallypage->sizeHint(); newprofilewizardciscomanuallypage->sizeHint();
connect ( newprofilewizardciscomanuallypagecontent->GroupPasswordLineEdit , TQT_SIGNAL ( textChanged ( const TQString& ) ), this, TQT_SLOT ( pskToggled ( const TQString& ) ) ); connect ( newprofilewizardciscomanuallypagecontent->GroupPasswordLineEdit , TQ_SIGNAL ( textChanged ( const TQString& ) ), this, TQ_SLOT ( pskToggled ( const TQString& ) ) );
// racoon // racoon
newprofilewizardracoonpage = new TQHBox ( 0 ); newprofilewizardracoonpage = new TQHBox ( 0 );
@ -277,11 +277,11 @@ void NewProfileWizard::setupPages()
newprofilewizardracoonpagecontent->PerfectForwardSecurityCheckbox->setChecked(true); newprofilewizardracoonpagecontent->PerfectForwardSecurityCheckbox->setChecked(true);
newprofilewizardracoonpagecontent->PerfectForwardSecrecyCombobox->setCurrentText("modp2048"); newprofilewizardracoonpagecontent->PerfectForwardSecrecyCombobox->setCurrentText("modp2048");
connect ( newprofilewizardracoonpagecontent->LocalIdTypeCombobox, TQT_SIGNAL ( highlighted ( const TQString& ) ), this, TQT_SLOT ( localIDTypeRacoonToggled ( const TQString& ) ) ); connect ( newprofilewizardracoonpagecontent->LocalIdTypeCombobox, TQ_SIGNAL ( highlighted ( const TQString& ) ), this, TQ_SLOT ( localIDTypeRacoonToggled ( const TQString& ) ) );
connect ( newprofilewizardracoonpagecontent->RemoteIdTypeCombobox, TQT_SIGNAL ( highlighted ( const TQString& ) ), this, TQT_SLOT ( remoteIDTypeRacoonToggled ( const TQString& ) ) ); connect ( newprofilewizardracoonpagecontent->RemoteIdTypeCombobox, TQ_SIGNAL ( highlighted ( const TQString& ) ), this, TQ_SLOT ( remoteIDTypeRacoonToggled ( const TQString& ) ) );
connect ( newprofilewizardracoonpagecontent->IkeGroupCheckbox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( ikeGroupToggled ( bool ) ) ); connect ( newprofilewizardracoonpagecontent->IkeGroupCheckbox, TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( ikeGroupToggled ( bool ) ) );
connect ( newprofilewizardracoonpagecontent->UseXauthCheckBox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(useXauthRacoonToggled(bool))); connect ( newprofilewizardracoonpagecontent->UseXauthCheckBox, TQ_SIGNAL(toggled(bool)),this, TQ_SLOT(useXauthRacoonToggled(bool)));
Utils::IpsecAlgos KernelCrypto = Utils ( GlobalConfig ).getKernelCrypto(); Utils::IpsecAlgos KernelCrypto = Utils ( GlobalConfig ).getKernelCrypto();
@ -397,16 +397,16 @@ void NewProfileWizard::setupPages()
newprofilewizardfreeswanpagecontent->UseModeConfigCheckBox->hide(); newprofilewizardfreeswanpagecontent->UseModeConfigCheckBox->hide();
newprofilewizardfreeswanpagecontent->PerfectForwardSecurityCheckbox->setChecked(true); newprofilewizardfreeswanpagecontent->PerfectForwardSecurityCheckbox->setChecked(true);
connect ( newprofilewizardfreeswanpagecontent->LocalIdTypeCombobox, TQT_SIGNAL ( highlighted ( const TQString& ) ), this, TQT_SLOT ( localIDTypeIpsecToggled ( const TQString& ) ) ); connect ( newprofilewizardfreeswanpagecontent->LocalIdTypeCombobox, TQ_SIGNAL ( highlighted ( const TQString& ) ), this, TQ_SLOT ( localIDTypeIpsecToggled ( const TQString& ) ) );
connect( newprofilewizardfreeswanpagecontent->UseCustomEspCheckBox, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( useEspToogled(bool) ) ); connect( newprofilewizardfreeswanpagecontent->UseCustomEspCheckBox, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( useEspToogled(bool) ) );
connect( newprofilewizardfreeswanpagecontent->UseCustomIkeCheckBox, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( useIkeToggled(bool) ) ); connect( newprofilewizardfreeswanpagecontent->UseCustomIkeCheckBox, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( useIkeToggled(bool) ) );
connect( newprofilewizardfreeswanpagecontent->UseLeftNextHopCheckBox, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( useLeftNextHopToggled(bool) ) ); connect( newprofilewizardfreeswanpagecontent->UseLeftNextHopCheckBox, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( useLeftNextHopToggled(bool) ) );
connect( newprofilewizardfreeswanpagecontent->UseRightNextHopCheckBox, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( useRightNextHopToggled(bool) ) ); connect( newprofilewizardfreeswanpagecontent->UseRightNextHopCheckBox, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( useRightNextHopToggled(bool) ) );
connect (newprofilewizardfreeswanpagecontent->UseXauthCheckBox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(useXauthFreeswanToggled(bool))); connect (newprofilewizardfreeswanpagecontent->UseXauthCheckBox, TQ_SIGNAL(toggled(bool)),this, TQ_SLOT(useXauthFreeswanToggled(bool)));
connect ( newprofilewizardfreeswanpagecontent->LocalIdTypeCombobox, TQT_SIGNAL ( highlighted ( const TQString& ) ), this, TQT_SLOT ( localIDTypeIpsecToggled ( const TQString& ) ) ); connect ( newprofilewizardfreeswanpagecontent->LocalIdTypeCombobox, TQ_SIGNAL ( highlighted ( const TQString& ) ), this, TQ_SLOT ( localIDTypeIpsecToggled ( const TQString& ) ) );
connect ( newprofilewizardfreeswanpagecontent->RemoteIdTypeCombobox, TQT_SIGNAL ( highlighted ( const TQString& ) ), this, TQT_SLOT ( remoteIDTypeIpsecToggled ( const TQString& ) ) ); connect ( newprofilewizardfreeswanpagecontent->RemoteIdTypeCombobox, TQ_SIGNAL ( highlighted ( const TQString& ) ), this, TQ_SLOT ( remoteIDTypeIpsecToggled ( const TQString& ) ) );
newprofilewizardfreeswanpage->sizeHint(); newprofilewizardfreeswanpage->sizeHint();
@ -426,8 +426,8 @@ void NewProfileWizard::setupPages()
setupPixmapContent71->resize ( setupPixmapContent71->sizeHint() ); setupPixmapContent71->resize ( setupPixmapContent71->sizeHint() );
newprofilewizardopenvpnauthpagecontent = new NewProfileWizardOpenvpnAuth ( newprofilewizardopenvpnauthpage ); newprofilewizardopenvpnauthpagecontent = new NewProfileWizardOpenvpnAuth ( newprofilewizardopenvpnauthpage );
newprofilewizardopenvpnauthpage->sizeHint(); newprofilewizardopenvpnauthpage->sizeHint();
connect ( newprofilewizardopenvpnauthpagecontent->AuthWithUsernameAndPasswordCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( authenticateWithUsernameAndPasswordToggled ( bool ) ) ); connect ( newprofilewizardopenvpnauthpagecontent->AuthWithUsernameAndPasswordCheckBox, TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( authenticateWithUsernameAndPasswordToggled ( bool ) ) );
connect ( newprofilewizardopenvpnauthpagecontent->UseAuthenticationAlgorithmCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( useAuthenticationAlgorithmToggled ( bool ) ) ); connect ( newprofilewizardopenvpnauthpagecontent->UseAuthenticationAlgorithmCheckBox, TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( useAuthenticationAlgorithmToggled ( bool ) ) );
newprofilewizardopenvpnpage = new TQHBox ( 0 ); newprofilewizardopenvpnpage = new TQHBox ( 0 );
// newprofilewizardopenvpnpage->setSpacing(8); // newprofilewizardopenvpnpage->setSpacing(8);
@ -450,13 +450,13 @@ void NewProfileWizard::setupPages()
newprofilewizardopenvpnpagecontent->UseUserdefiniedCipherCheckBox->setChecked ( false ); newprofilewizardopenvpnpagecontent->UseUserdefiniedCipherCheckBox->setChecked ( false );
newprofilewizardopenvpnpagecontent->UseHttpProxyCheckBox->setChecked ( false ); newprofilewizardopenvpnpagecontent->UseHttpProxyCheckBox->setChecked ( false );
connect ( newprofilewizardopenvpnpagecontent->UseUserdefinedPortCheckBox , TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( userdefinedOpenvpnPortToggeled ( bool ) ) ); connect ( newprofilewizardopenvpnpagecontent->UseUserdefinedPortCheckBox , TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( userdefinedOpenvpnPortToggeled ( bool ) ) );
connect ( newprofilewizardopenvpnpagecontent->UseNsCertTypeCheckBox , TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( nsCertTypeOpenvpnToggled ( bool ) ) ); connect ( newprofilewizardopenvpnpagecontent->UseNsCertTypeCheckBox , TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( nsCertTypeOpenvpnToggled ( bool ) ) );
connect ( newprofilewizardopenvpnpagecontent->UseUserdefinedPortCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( userdefinedOpenvpnPortToggeled ( bool ) ) ); connect ( newprofilewizardopenvpnpagecontent->UseUserdefinedPortCheckBox, TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( userdefinedOpenvpnPortToggeled ( bool ) ) );
connect ( newprofilewizardopenvpnpagecontent->UseTlsAuthCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( useTlsAuthToggled ( bool ) ) ); connect ( newprofilewizardopenvpnpagecontent->UseTlsAuthCheckBox, TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( useTlsAuthToggled ( bool ) ) );
connect ( newprofilewizardopenvpnpagecontent->UseTlsRemoteHostCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( useTlsRemoteHostToggled ( bool ) ) ); connect ( newprofilewizardopenvpnpagecontent->UseTlsRemoteHostCheckBox, TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( useTlsRemoteHostToggled ( bool ) ) );
connect ( newprofilewizardopenvpnpagecontent->UseUserdefiniedCipherCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( useUserdefiniedCipherToggled ( bool ) ) ); connect ( newprofilewizardopenvpnpagecontent->UseUserdefiniedCipherCheckBox, TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( useUserdefiniedCipherToggled ( bool ) ) );
connect ( newprofilewizardopenvpnpagecontent->UseHttpProxyCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( useHttpProxyToggeled ( bool ) ) ); connect ( newprofilewizardopenvpnpagecontent->UseHttpProxyCheckBox, TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( useHttpProxyToggeled ( bool ) ) );
TQStringList ciphers = Utils ( GlobalConfig ).getOpenvpnCiphers(); TQStringList ciphers = Utils ( GlobalConfig ).getOpenvpnCiphers();
TQStringList digests = Utils ( GlobalConfig ).getOpenvpnDigests(); TQStringList digests = Utils ( GlobalConfig ).getOpenvpnDigests();
@ -504,9 +504,9 @@ void NewProfileWizard::setupPages()
newprofilewizardpptppagecontent->AuthMethodComboBox->insertItem ( "mschap" ); newprofilewizardpptppagecontent->AuthMethodComboBox->insertItem ( "mschap" );
newprofilewizardpptppagecontent->AuthMethodComboBox->insertItem ( "mschap-v2" ); newprofilewizardpptppagecontent->AuthMethodComboBox->insertItem ( "mschap-v2" );
connect( newprofilewizardpptppagecontent->DnsServerCheckbox, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( useDnsServerToggled(bool) ) ); connect( newprofilewizardpptppagecontent->DnsServerCheckbox, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( useDnsServerToggled(bool) ) );
connect( newprofilewizardpptppagecontent->UseSearchDomainInResolvConfCheckbox, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( useSearchDomainInResolvConfToggled(bool) ) ); connect( newprofilewizardpptppagecontent->UseSearchDomainInResolvConfCheckbox, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( useSearchDomainInResolvConfToggled(bool) ) );
connect( newprofilewizardpptppagecontent->UseDomainInResolvConfCheckbox, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( useDomainInResolvConfToggled(bool) ) ); connect( newprofilewizardpptppagecontent->UseDomainInResolvConfCheckbox, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( useDomainInResolvConfToggled(bool) ) );
// vtun // vtun
newprofilewizardvtunpage = new TQHBox ( 0 ); newprofilewizardvtunpage = new TQHBox ( 0 );
@ -516,7 +516,7 @@ void NewProfileWizard::setupPages()
setupPixmapContent19->resize ( setupPixmapContent19->sizeHint() ); setupPixmapContent19->resize ( setupPixmapContent19->sizeHint() );
newprofilewizardvtunpagecontent = new ProfileVtunOptions ( newprofilewizardvtunpage ); newprofilewizardvtunpagecontent = new ProfileVtunOptions ( newprofilewizardvtunpage );
newprofilewizardvtunpage->sizeHint(); newprofilewizardvtunpage->sizeHint();
connect ( newprofilewizardvtunpagecontent->PortCheckbox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( usePortToggled ( bool ) ) ); connect ( newprofilewizardvtunpagecontent->PortCheckbox, TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( usePortToggled ( bool ) ) );
// ssh // ssh
newprofilewizardsshpage = new TQHBox ( 0 ); newprofilewizardsshpage = new TQHBox ( 0 );
@ -579,7 +579,7 @@ void NewProfileWizard::setupPages()
profilenetworkvirtualipoptionscontent = new ProfileNetworkVirtualIpOptions ( newprofilewizardvirtualipaddresspage ); profilenetworkvirtualipoptionscontent = new ProfileNetworkVirtualIpOptions ( newprofilewizardvirtualipaddresspage );
newprofilewizardvirtualipaddresspage->sizeHint(); newprofilewizardvirtualipaddresspage->sizeHint();
insertPage ( newprofilewizardvirtualipaddresspage, "<b>" + i18n ( "Virtual IP address options" ) + "</b>",-1 ); insertPage ( newprofilewizardvirtualipaddresspage, "<b>" + i18n ( "Virtual IP address options" ) + "</b>",-1 );
connect ( profilenetworkvirtualipoptionscontent->UseVirtualIPCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( useVirtualIpAddressToggled ( bool ) ) ); connect ( profilenetworkvirtualipoptionscontent->UseVirtualIPCheckBox, TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( useVirtualIpAddressToggled ( bool ) ) );
// psk // psk
newprofilewizardpskpage = new TQHBox ( 0 ); newprofilewizardpskpage = new TQHBox ( 0 );
@ -590,8 +590,8 @@ void NewProfileWizard::setupPages()
newprofilewizardpskcontent = new NewProfileWizardPsk ( newprofilewizardpskpage ); newprofilewizardpskcontent = new NewProfileWizardPsk ( newprofilewizardpskpage );
newprofilewizardpskpage->sizeHint(); newprofilewizardpskpage->sizeHint();
connect ( newprofilewizardpskcontent->PskInFileCheckBox , TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( pskIsInFileToggled ( bool ) ) ); connect ( newprofilewizardpskcontent->PskInFileCheckBox , TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( pskIsInFileToggled ( bool ) ) );
connect ( newprofilewizardpskcontent->PSKLineEdit , TQT_SIGNAL ( textChanged ( const TQString & ) ), this, TQT_SLOT ( pskInputToggled ( const TQString& ) ) ); connect ( newprofilewizardpskcontent->PSKLineEdit , TQ_SIGNAL ( textChanged ( const TQString & ) ), this, TQ_SLOT ( pskInputToggled ( const TQString& ) ) );
newprofilewizardp12certselectionpage = new TQHBox ( 0 ); newprofilewizardp12certselectionpage = new TQHBox ( 0 );
// newprofilewizardp12certselectionpage->setSpacing(8); // newprofilewizardp12certselectionpage->setSpacing(8);
@ -600,7 +600,7 @@ void NewProfileWizard::setupPages()
setupPixmapContent74->resize ( setupPixmapContent74->sizeHint() ); setupPixmapContent74->resize ( setupPixmapContent74->sizeHint() );
newprofilewizardp12certselectioncontent = new NewProfileWizardP12CertSelection ( newprofilewizardp12certselectionpage ); newprofilewizardp12certselectioncontent = new NewProfileWizardP12CertSelection ( newprofilewizardp12certselectionpage );
newprofilewizardp12certselectionpage->sizeHint(); newprofilewizardp12certselectionpage->sizeHint();
connect ( newprofilewizardp12certselectioncontent->UseSmartcardCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( useSmartcardOnCertFormateToggled ( bool ) ) ); connect ( newprofilewizardp12certselectioncontent->UseSmartcardCheckBox, TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( useSmartcardOnCertFormateToggled ( bool ) ) );
// cert // cert
newprofilewizardcertpage = new TQHBox ( 0 ); newprofilewizardcertpage = new TQHBox ( 0 );
@ -610,11 +610,11 @@ void NewProfileWizard::setupPages()
setupPixmapContent73->resize ( setupPixmapContent73->sizeHint() ); setupPixmapContent73->resize ( setupPixmapContent73->sizeHint() );
newprofilewizardcertcontent = new NewProfileWizardCert ( newprofilewizardcertpage ); newprofilewizardcertcontent = new NewProfileWizardCert ( newprofilewizardcertpage );
newprofilewizardcertpage->sizeHint(); newprofilewizardcertpage->sizeHint();
connect ( newprofilewizardcertcontent->UseSpecialServerCertificateCheckBox , TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( useSpecialServerCertificateToggled ( bool ) ) ); connect ( newprofilewizardcertcontent->UseSpecialServerCertificateCheckBox , TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( useSpecialServerCertificateToggled ( bool ) ) );
connect ( newprofilewizardcertcontent->UseSmartcardCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( useSmartcardToggled ( bool ) ) ); connect ( newprofilewizardcertcontent->UseSmartcardCheckBox, TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( useSmartcardToggled ( bool ) ) );
connect ( newprofilewizardcertcontent->UsePkcs11ProvidersCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( usePkcs11ProvidersToggled ( bool ) ) ); connect ( newprofilewizardcertcontent->UsePkcs11ProvidersCheckBox, TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( usePkcs11ProvidersToggled ( bool ) ) );
connect ( newprofilewizardcertcontent->DetectPkcs11SlotsPushButton, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( detectPkcs11Slots() ) ); connect ( newprofilewizardcertcontent->DetectPkcs11SlotsPushButton, TQ_SIGNAL ( clicked() ), this, TQ_SLOT ( detectPkcs11Slots() ) );
connect ( newprofilewizardcertcontent->DetectPkcs11IdPushButton, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( detectPkcs11Ids() ) ); connect ( newprofilewizardcertcontent->DetectPkcs11IdPushButton, TQ_SIGNAL ( clicked() ), this, TQ_SLOT ( detectPkcs11Ids() ) );
newprofilewizardcertcontent->Pkcs11SlotTypeComboBox->setEnabled ( false ); newprofilewizardcertcontent->Pkcs11SlotTypeComboBox->setEnabled ( false );
newprofilewizardcertcontent->Pkcs11SlotTypeLabel->setEnabled ( false ); newprofilewizardcertcontent->Pkcs11SlotTypeLabel->setEnabled ( false );
newprofilewizardcertcontent->Pkcs11ProvidersURLRequester->setURL ( TQString ( "/usr/local/lib/libetpkcs11.so" ) ); newprofilewizardcertcontent->Pkcs11ProvidersURLRequester->setURL ( TQString ( "/usr/local/lib/libetpkcs11.so" ) );
@ -629,9 +629,9 @@ void NewProfileWizard::setupPages()
newprofilewizarduserpagecontent = new NewProfileWizardUser ( newprofilewizarduserpage ); newprofilewizarduserpagecontent = new NewProfileWizardUser ( newprofilewizarduserpage );
newprofilewizarduserpage->sizeHint(); newprofilewizarduserpage->sizeHint();
connect ( newprofilewizarduserpagecontent->PasswordEdit , TQT_SIGNAL ( textChanged ( const TQString& ) ), this, TQT_SLOT ( userpassToggled ( const TQString& ) ) ); connect ( newprofilewizarduserpagecontent->PasswordEdit , TQ_SIGNAL ( textChanged ( const TQString& ) ), this, TQ_SLOT ( userpassToggled ( const TQString& ) ) );
connect ( newprofilewizarduserpagecontent->UsernameLineEdit , TQT_SIGNAL ( textChanged ( const TQString& ) ), this, TQT_SLOT ( usernameToggled ( const TQString& ) ) ); connect ( newprofilewizarduserpagecontent->UsernameLineEdit , TQ_SIGNAL ( textChanged ( const TQString& ) ), this, TQ_SLOT ( usernameToggled ( const TQString& ) ) );
connect ( newprofilewizarduserpagecontent->NtDomainNameCheckbox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( domainNameToggled ( bool ) ) ); connect ( newprofilewizarduserpagecontent->NtDomainNameCheckbox, TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( domainNameToggled ( bool ) ) );
newprofilewizarduserpagecontent ->NtDomainNameCheckbox->setEnabled ( true ); newprofilewizarduserpagecontent ->NtDomainNameCheckbox->setEnabled ( true );
newprofilewizarduserpagecontent ->NtDomainNameCheckbox->hide(); newprofilewizarduserpagecontent ->NtDomainNameCheckbox->hide();
newprofilewizarduserpagecontent ->NtDomainNameLineedit->hide(); newprofilewizarduserpagecontent ->NtDomainNameLineedit->hide();
@ -663,10 +663,10 @@ void NewProfileWizard::setupPages()
newprofilewizardnetworkcontent->TunnelDeviceTypeComboBox->insertItem("tun"); newprofilewizardnetworkcontent->TunnelDeviceTypeComboBox->insertItem("tun");
newprofilewizardnetworkcontent->TunnelDeviceTypeComboBox->insertItem("tap"); newprofilewizardnetworkcontent->TunnelDeviceTypeComboBox->insertItem("tap");
connect ( newprofilewizardnetworkcontent->MtuCheckbox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( mtuToggled ( bool ) ) ); connect ( newprofilewizardnetworkcontent->MtuCheckbox, TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( mtuToggled ( bool ) ) );
connect ( newprofilewizardnetworkcontent->MtuCheckbox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( mtuToggled ( bool ) ) ); connect ( newprofilewizardnetworkcontent->MtuCheckbox, TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( mtuToggled ( bool ) ) );
connect ( newprofilewizardnetworkcontent->UseRemoteNetworkCheckBox, TQT_SIGNAL ( toggled ( bool ) ) , this, TQT_SLOT( useRemoteNetworkToggled (bool ))); connect ( newprofilewizardnetworkcontent->UseRemoteNetworkCheckBox, TQ_SIGNAL ( toggled ( bool ) ) , this, TQ_SLOT( useRemoteNetworkToggled (bool )));
connect ( newprofilewizardnetworkcontent->TunnelDeviceTypeComboBox, TQT_SIGNAL(activated ( const TQString & )),this, TQT_SLOT(tunnelDeviceTypeChanged(const TQString& ))); connect ( newprofilewizardnetworkcontent->TunnelDeviceTypeComboBox, TQ_SIGNAL(activated ( const TQString & )),this, TQ_SLOT(tunnelDeviceTypeChanged(const TQString& )));
// network routes // network routes
newprofilewizardnetworkroutepage = new TQHBox ( 0 ); newprofilewizardnetworkroutepage = new TQHBox ( 0 );
@ -677,7 +677,7 @@ void NewProfileWizard::setupPages()
newprofilewizardnetworkroutecontent = new ProfileNetworkRouteOptions ( newprofilewizardnetworkroutepage ); newprofilewizardnetworkroutecontent = new ProfileNetworkRouteOptions ( newprofilewizardnetworkroutepage );
newprofilewizardnetworkroutepage->sizeHint(); newprofilewizardnetworkroutepage->sizeHint();
connect(newprofilewizardnetworkroutecontent->DefaultRouteComboBox, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(defaultRouteToggled(const TQString&))); connect(newprofilewizardnetworkroutecontent->DefaultRouteComboBox, TQ_SIGNAL(activated(const TQString&)), this, TQ_SLOT(defaultRouteToggled(const TQString&)));
newprofilewizardnetworkroutecontent->DefaultRouteComboBox->setCurrentItem(1); newprofilewizardnetworkroutecontent->DefaultRouteComboBox->setCurrentItem(1);
@ -692,8 +692,8 @@ void NewProfileWizard::setupPages()
newprofilewizardnatpage->sizeHint(); newprofilewizardnatpage->sizeHint();
newprofilewizardnatcontent->UseUdpCheckbox->setChecked ( true ); newprofilewizardnatcontent->UseUdpCheckbox->setChecked ( true );
newprofilewizardnatcontent->UseNatCheckbox->setChecked ( true ); newprofilewizardnatcontent->UseNatCheckbox->setChecked ( true );
connect ( newprofilewizardnatcontent->UseNatCheckbox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( useNatToggled ( bool ) ) ); connect ( newprofilewizardnatcontent->UseNatCheckbox, TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( useNatToggled ( bool ) ) );
connect ( newprofilewizardnatcontent->UdpPortCheckbox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( udpPortToggled ( bool ) ) ); connect ( newprofilewizardnatcontent->UdpPortCheckbox, TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( udpPortToggled ( bool ) ) );
useNatToggled(true); useNatToggled(true);
// connectionstatuscheck // connectionstatuscheck
@ -705,8 +705,8 @@ void NewProfileWizard::setupPages()
newprofilewizardconnectionstatuscheckcontent = new NewProfileWizardConnectionStatusCheck ( newprofilewizardconnectionstatuscheckpage ); newprofilewizardconnectionstatuscheckcontent = new NewProfileWizardConnectionStatusCheck ( newprofilewizardconnectionstatuscheckpage );
newprofilewizardconnectionstatuscheckpage->sizeHint(); newprofilewizardconnectionstatuscheckpage->sizeHint();
insertPage ( newprofilewizardconnectionstatuscheckpage, "<b>" + i18n ( "Connection status check" ) + "</b>", -1 ); insertPage ( newprofilewizardconnectionstatuscheckpage, "<b>" + i18n ( "Connection status check" ) + "</b>", -1 );
connect ( newprofilewizardconnectionstatuscheckcontent->PingUserdefiniedAddressCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( pingIpAfterConnectToggled ( bool ) ) ); connect ( newprofilewizardconnectionstatuscheckcontent->PingUserdefiniedAddressCheckBox, TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( pingIpAfterConnectToggled ( bool ) ) );
connect ( newprofilewizardconnectionstatuscheckcontent->UseConnectionStatusCheckCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( connectionStatusCheckToggled ( bool ) ) ); connect ( newprofilewizardconnectionstatuscheckcontent->UseConnectionStatusCheckCheckBox, TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( connectionStatusCheckToggled ( bool ) ) );
// connectoptions // connectoptions
newprofilewizardconnectoptionspage = new TQHBox ( 0 ); newprofilewizardconnectoptionspage = new TQHBox ( 0 );
@ -1189,7 +1189,7 @@ void NewProfileWizard::next ()
insertPage ( newprofilewizardopenvpnauthpage, "<b>" + i18n ( "OpenVPN authentication settings" ) + "</b>", indexOf ( currentpage ) + 1 ); insertPage ( newprofilewizardopenvpnauthpage, "<b>" + i18n ( "OpenVPN authentication settings" ) + "</b>", indexOf ( currentpage ) + 1 );
connect ( newprofilewizardopenvpnauthpagecontent->AuthWithUsernameAndPasswordCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( authenticateWithUsernameAndPasswordToggled ( bool ) ) ); connect ( newprofilewizardopenvpnauthpagecontent->AuthWithUsernameAndPasswordCheckBox, TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( authenticateWithUsernameAndPasswordToggled ( bool ) ) );
newprofilewizardopenvpnauthpagecontent->UserdefiniedDigestComboBox->setCurrentText ( "SHA1" ); newprofilewizardopenvpnauthpagecontent->UserdefiniedDigestComboBox->setCurrentText ( "SHA1" );

44
src/openvpnmanagementhandler.cpp
Unescape View File

@ -54,18 +54,18 @@ void OpenvpnManagementHandler::closeConnection()
{ {
if (socket) if (socket)
{ {
//disconnect( socket, TQT_SIGNAL( connected() ), this, TQT_SLOT( socketConnected() ) ); //disconnect( socket, TQ_SIGNAL( connected() ), this, TQ_SLOT( socketConnected() ) );
disconnect( socket, TQT_SIGNAL( connectionClosed() ), this, TQT_SLOT( socketConnectionClosed() ) ); disconnect( socket, TQ_SIGNAL( connectionClosed() ), this, TQ_SLOT( socketConnectionClosed() ) );
disconnect( socket, TQT_SIGNAL( readyRead() ), this, TQT_SLOT( socketReadyRead() ) ); disconnect( socket, TQ_SIGNAL( readyRead() ), this, TQ_SLOT( socketReadyRead() ) );
disconnect( socket, TQT_SIGNAL( error( int ) ), this, TQT_SLOT( socketError( int ) ) ); disconnect( socket, TQ_SIGNAL( error( int ) ), this, TQ_SLOT( socketError( int ) ) );
disconnect( socket, TQT_SIGNAL( hostFound() ), this, TQT_SLOT( hostFound() ) ); disconnect( socket, TQ_SIGNAL( hostFound() ), this, TQ_SLOT( hostFound() ) );
socket->clearPendingData(); socket->clearPendingData();
socket->close(); socket->close();
if ( socket->state() == TQSocket::Closing ) if ( socket->state() == TQSocket::Closing )
{ {
// We have a delayed close. // We have a delayed close.
connect( socket, TQT_SIGNAL( delayedCloseFinished() ), this, TQT_SLOT( socketClosed() ) ); connect( socket, TQ_SIGNAL( delayedCloseFinished() ), this, TQ_SLOT( socketClosed() ) );
} }
else else
{ {
@ -86,10 +86,10 @@ void OpenvpnManagementHandler::socketConnectionClosed()
void OpenvpnManagementHandler::socketClosed() void OpenvpnManagementHandler::socketClosed()
{ {
socketReallyClosed = false; socketReallyClosed = false;
disconnect( socket, TQT_SIGNAL( delayedCloseFinished() ), this, TQT_SLOT( socketClosed() ) ); disconnect( socket, TQ_SIGNAL( delayedCloseFinished() ), this, TQ_SLOT( socketClosed() ) );
delete socket; delete socket;
greetingtimer.stop(); greetingtimer.stop();
disconnect ( &greetingtimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( greetingTimedOut() ) ); disconnect ( &greetingtimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( greetingTimedOut() ) );
if ( GlobalConfig->KvpncDebugLevel > 1 ) if ( GlobalConfig->KvpncDebugLevel > 1 )
GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Socket to the OpenVPN manage port (%1) closed." ).arg( TQString().setNum( GlobalConfig->OpenvpnManagementPort ) ), GlobalConfig->debug ); GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "Socket to the OpenVPN manage port (%1) closed." ).arg( TQString().setNum( GlobalConfig->OpenvpnManagementPort ) ), GlobalConfig->debug );
socketReallyClosed = true; socketReallyClosed = true;
@ -99,8 +99,8 @@ void OpenvpnManagementHandler::socketClosed()
void OpenvpnManagementHandler::socketConnected() void OpenvpnManagementHandler::socketConnected()
{ {
connect( socket, TQT_SIGNAL( connectionClosed() ), this, TQT_SLOT( socketConnectionClosed() ) ); connect( socket, TQ_SIGNAL( connectionClosed() ), this, TQ_SLOT( socketConnectionClosed() ) );
connect( socket, TQT_SIGNAL( readyRead() ), this, TQT_SLOT( socketReadyRead() ) ); connect( socket, TQ_SIGNAL( readyRead() ), this, TQ_SLOT( socketReadyRead() ) );
// KMessageBox::error ( 0, TQString("bar"), TQString("foo") ); // KMessageBox::error ( 0, TQString("bar"), TQString("foo") );
connectedToManagementPort=true; connectedToManagementPort=true;
@ -122,7 +122,7 @@ void OpenvpnManagementHandler::socketError( int e )
void OpenvpnManagementHandler::greetingTimedOut() void OpenvpnManagementHandler::greetingTimedOut()
{ {
disconnect ( &greetingtimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( greetingTimedOut() ) ); disconnect ( &greetingtimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( greetingTimedOut() ) );
greetingtimer.stop(); greetingtimer.stop();
GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n("Got no greeting within %1 seconds from management interface, retrying.").arg("3"), GlobalConfig->error ); GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n("Got no greeting within %1 seconds from management interface, retrying.").arg("3"), GlobalConfig->error );
@ -194,7 +194,7 @@ void OpenvpnManagementHandler::socketReadyRead()
if ( line.find( "INFO:OpenVPN Management Interface", 0, FALSE ) > -1 ) if ( line.find( "INFO:OpenVPN Management Interface", 0, FALSE ) > -1 )
{ {
gotGreeting=true; gotGreeting=true;
disconnect ( &greetingtimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( greetingTimedOut() ) ); disconnect ( &greetingtimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( greetingTimedOut() ) );
greetingtimer.stop (); greetingtimer.stop ();
if ( GlobalConfig->KvpncDebugLevel > 2 ) if ( GlobalConfig->KvpncDebugLevel > 2 )
@ -836,16 +836,16 @@ void OpenvpnManagementHandler::socketReadyRead()
{ {
if (socket) if (socket)
{ {
disconnect( socket, TQT_SIGNAL( connected() ), this, TQT_SLOT( socketConnected() ) ); disconnect( socket, TQ_SIGNAL( connected() ), this, TQ_SLOT( socketConnected() ) );
disconnect( socket, TQT_SIGNAL( connectionClosed() ), this, TQT_SLOT( socketConnectionClosed() ) ); disconnect( socket, TQ_SIGNAL( connectionClosed() ), this, TQ_SLOT( socketConnectionClosed() ) );
disconnect( socket, TQT_SIGNAL( readyRead() ), this, TQT_SLOT( socketReadyRead() ) ); disconnect( socket, TQ_SIGNAL( readyRead() ), this, TQ_SLOT( socketReadyRead() ) );
disconnect( socket, TQT_SIGNAL( error( int ) ), this, TQT_SLOT( socketError( int ) ) ); disconnect( socket, TQ_SIGNAL( error( int ) ), this, TQ_SLOT( socketError( int ) ) );
disconnect( socket, TQT_SIGNAL( hostFound() ), this, TQT_SLOT( hostFound() ) ); disconnect( socket, TQ_SIGNAL( hostFound() ), this, TQ_SLOT( hostFound() ) );
socket->close(); socket->close();
if ( socket->state() == TQSocket::Closing ) if ( socket->state() == TQSocket::Closing )
{ {
// We have a delayed close. // We have a delayed close.
connect( socket, TQT_SIGNAL(delayedCloseFinished()), this, TQT_SLOT(socketClosed()) ); connect( socket, TQ_SIGNAL(delayedCloseFinished()), this, TQ_SLOT(socketClosed()) );
} }
else else
{ {
@ -879,9 +879,9 @@ bool OpenvpnManagementHandler::doConnect()
socket = new TQSocket( this ); socket = new TQSocket( this );
if (socket) if (socket)
{ {
connect( socket, TQT_SIGNAL( connected() ), this, TQT_SLOT( socketConnected() ) ); connect( socket, TQ_SIGNAL( connected() ), this, TQ_SLOT( socketConnected() ) );
connect( socket, TQT_SIGNAL( hostFound() ), this, TQT_SLOT( hostFound() ) ); connect( socket, TQ_SIGNAL( hostFound() ), this, TQ_SLOT( hostFound() ) );
connect( socket, TQT_SIGNAL( error( int ) ), this, TQT_SLOT( socketError( int ) ) ); connect( socket, TQ_SIGNAL( error( int ) ), this, TQ_SLOT( socketError( int ) ) );
if ( socket->state() == TQSocket::Idle ) if ( socket->state() == TQSocket::Idle )
@ -892,7 +892,7 @@ bool OpenvpnManagementHandler::doConnect()
} }
socket->connectToHost( "127.0.0.1", GlobalConfig->OpenvpnManagementPort ); socket->connectToHost( "127.0.0.1", GlobalConfig->OpenvpnManagementPort );
connect ( &greetingtimer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( greetingTimedOut() ) ); connect ( &greetingtimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( greetingTimedOut() ) );
greetingtimer.start ( 3 * 1000, TRUE ); greetingtimer.start ( 3 * 1000, TRUE );
if ( GlobalConfig->KvpncDebugLevel > 2 ) if ( GlobalConfig->KvpncDebugLevel > 2 )

136
src/preferencesdialog.cpp
Unescape View File

@ -696,7 +696,7 @@ PreferencesDialog::PreferencesDialog( TQWidget *parent, TQApplication *app, TQTe
ProfileCiscoOptionsWidget->CiscoNatModeComboBox->insertItem("force-natt"); ProfileCiscoOptionsWidget->CiscoNatModeComboBox->insertItem("force-natt");
ProfileCiscoOptionsWidget->CiscoNatModeComboBox->insertItem("cisco-udp"); ProfileCiscoOptionsWidget->CiscoNatModeComboBox->insertItem("cisco-udp");
ProfileCiscoOptionsWidget->CiscoNatModeComboBox->insertItem("none"); ProfileCiscoOptionsWidget->CiscoNatModeComboBox->insertItem("none");
connect (ProfileCiscoOptionsWidget->CiscoNatModeComboBox, TQT_SIGNAL(textChanged ( const TQString &)), this, TQT_SLOT(natModeToggled( const TQString &))); connect (ProfileCiscoOptionsWidget->CiscoNatModeComboBox, TQ_SIGNAL(textChanged ( const TQString &)), this, TQ_SLOT(natModeToggled( const TQString &)));
profileAddedOrDeleted = false; profileAddedOrDeleted = false;
@ -961,7 +961,7 @@ void PreferencesDialog::setupGui()
lo = new TQVBoxLayout( GeneralFrame, 0, KDialog::spacingHint() ); lo = new TQVBoxLayout( GeneralFrame, 0, KDialog::spacingHint() );
GeneralOptionsWidget = new ConfigGeneralOptions( GeneralFrame ); GeneralOptionsWidget = new ConfigGeneralOptions( GeneralFrame );
lo->addWidget( GeneralOptionsWidget ); lo->addWidget( GeneralOptionsWidget );
connect(GeneralOptionsWidget->useTDEwalletCheckBox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(useTDEwalletToggled(bool))); connect(GeneralOptionsWidget->useTDEwalletCheckBox, TQ_SIGNAL(toggled(bool)),this, TQ_SLOT(useTDEwalletToggled(bool)));
// const TQObjectList *GeneralOptionsWidgetList = GeneralOptionsWidget->queryList( "TQCheckBox" ); // const TQObjectList *GeneralOptionsWidgetList = GeneralOptionsWidget->queryList( "TQCheckBox" );
// TQObjectListIt it( *GeneralOptionsWidgetList ); // TQObjectListIt it( *GeneralOptionsWidgetList );
@ -969,7 +969,7 @@ void PreferencesDialog::setupGui()
// for ( TQObject *child = it.current(); it; ++it) // for ( TQObject *child = it.current(); it; ++it)
// { // {
// // std::cout << "name: " << child->name() << std::endl; // // std::cout << "name: " << child->name() << std::endl;
// connect(child, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(checkboxStateChanged(int))); // connect(child, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(checkboxStateChanged(int)));
// } // }
// Debug // Debug
@ -1024,16 +1024,16 @@ void PreferencesDialog::setupGui()
// DaemonFrame->adjustSize(); // DaemonFrame->adjustSize();
connect(ConfigDaemonOptionsWidget->OpenvpnPathInput, TQT_SIGNAL( urlSelected( const TQString& ) ), this, TQT_SLOT( OpenvpnPathChanged( const TQString& ) ) ); connect(ConfigDaemonOptionsWidget->OpenvpnPathInput, TQ_SIGNAL( urlSelected( const TQString& ) ), this, TQ_SLOT( OpenvpnPathChanged( const TQString& ) ) );
connect(ConfigDaemonOptionsWidget->FreeswanPathInput, TQT_SIGNAL( urlSelected( const TQString& ) ), this, TQT_SLOT( FreeswanPathChanged( const TQString& ) ) ); connect(ConfigDaemonOptionsWidget->FreeswanPathInput, TQ_SIGNAL( urlSelected( const TQString& ) ), this, TQ_SLOT( FreeswanPathChanged( const TQString& ) ) );
connect(ConfigDaemonOptionsWidget->PppdPathInput, TQT_SIGNAL( urlSelected( const TQString& ) ), this, TQT_SLOT( PppdPathChanged( const TQString& ) ) ); connect(ConfigDaemonOptionsWidget->PppdPathInput, TQ_SIGNAL( urlSelected( const TQString& ) ), this, TQ_SLOT( PppdPathChanged( const TQString& ) ) );
connect(ConfigDaemonOptionsWidget->PptpPathInput, TQT_SIGNAL( urlSelected( const TQString& ) ), this, TQT_SLOT( PptpPathChanged( const TQString& ) ) ); connect(ConfigDaemonOptionsWidget->PptpPathInput, TQ_SIGNAL( urlSelected( const TQString& ) ), this, TQ_SLOT( PptpPathChanged( const TQString& ) ) );
connect(ConfigDaemonOptionsWidget->RacoonPathInput, TQT_SIGNAL( urlSelected( const TQString& ) ), this, TQT_SLOT( RacoonPathChanged( const TQString& ) ) ); connect(ConfigDaemonOptionsWidget->RacoonPathInput, TQ_SIGNAL( urlSelected( const TQString& ) ), this, TQ_SLOT( RacoonPathChanged( const TQString& ) ) );
connect(ConfigDaemonOptionsWidget->VpncPathInput, TQT_SIGNAL( urlSelected( const TQString& ) ), this, TQT_SLOT( VpncPathChanged( const TQString& ) ) ); connect(ConfigDaemonOptionsWidget->VpncPathInput, TQ_SIGNAL( urlSelected( const TQString& ) ), this, TQ_SLOT( VpncPathChanged( const TQString& ) ) );
connect(ConfigDaemonOptionsWidget->L2tpdPathInput, TQT_SIGNAL( urlSelected( const TQString& ) ), this, TQT_SLOT( L2tpdPathChanged( const TQString& ) ) ); connect(ConfigDaemonOptionsWidget->L2tpdPathInput, TQ_SIGNAL( urlSelected( const TQString& ) ), this, TQ_SLOT( L2tpdPathChanged( const TQString& ) ) );
connect(ConfigDaemonOptionsWidget->Xl2tpdPathInput, TQT_SIGNAL( urlSelected( const TQString& ) ), this, TQT_SLOT( Xl2tpdPathChanged( const TQString& ) ) ); connect(ConfigDaemonOptionsWidget->Xl2tpdPathInput, TQ_SIGNAL( urlSelected( const TQString& ) ), this, TQ_SLOT( Xl2tpdPathChanged( const TQString& ) ) );
connect(ConfigDaemonOptionsWidget->VtundPathInput, TQT_SIGNAL( urlSelected( const TQString& ) ), this, TQT_SLOT( VtundPathChanged( const TQString& ) ) ); connect(ConfigDaemonOptionsWidget->VtundPathInput, TQ_SIGNAL( urlSelected( const TQString& ) ), this, TQ_SLOT( VtundPathChanged( const TQString& ) ) );
connect(ConfigDaemonOptionsWidget->SshPathInput, TQT_SIGNAL( urlSelected( const TQString& ) ), this, TQT_SLOT( SshPathChanged( const TQString& ) ) ); connect(ConfigDaemonOptionsWidget->SshPathInput, TQ_SIGNAL( urlSelected( const TQString& ) ), this, TQ_SLOT( SshPathChanged( const TQString& ) ) );
path.clear(); path.clear();
path << i18n( "Programs" ) << i18n( "Helper Programs" ); path << i18n( "Programs" ) << i18n( "Helper Programs" );
@ -1091,7 +1091,7 @@ void PreferencesDialog::setupGui()
lo->addWidget( ProfileUserSelectorWidget ); lo->addWidget( ProfileUserSelectorWidget );
lo->addWidget( ProfileUserOptionsWidget ); lo->addWidget( ProfileUserOptionsWidget );
ProfileUserSelector->setEnabled( true ); ProfileUserSelector->setEnabled( true );
connect(ProfileUserOptionsWidget->NtDomainNameCheckbox, TQT_SIGNAL(toggled(bool)), ProfileUserOptionsWidget, TQT_SLOT( domainNameToggled(bool) )); connect(ProfileUserOptionsWidget->NtDomainNameCheckbox, TQ_SIGNAL(toggled(bool)), ProfileUserOptionsWidget, TQ_SLOT( domainNameToggled(bool) ));
path.clear(); path.clear();
path << i18n( "Profile" ) << i18n( "Authenticate" ) << i18n( "Certificate" ); path << i18n( "Profile" ) << i18n( "Authenticate" ) << i18n( "Certificate" );
@ -1110,8 +1110,8 @@ void PreferencesDialog::setupGui()
lo->addWidget( ProfileCertSelectorWidget ); lo->addWidget( ProfileCertSelectorWidget );
lo->addWidget( ProfileCertOptionsWidget ); lo->addWidget( ProfileCertOptionsWidget );
ProfileCertSelector->setEnabled( true ); ProfileCertSelector->setEnabled( true );
connect(ProfileCertOptionsWidget->ImportCertificatePushButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(importCertificate())); connect(ProfileCertOptionsWidget->ImportCertificatePushButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(importCertificate()));
connect(ProfileCertOptionsWidget->UseCiscoCertStoreCheckBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(useCiscoCertStoreToggled(bool))); connect(ProfileCertOptionsWidget->UseCiscoCertStoreCheckBox, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(useCiscoCertStoreToggled(bool)));
path.clear(); path.clear();
path << i18n( "Profile" ) << i18n( "Authenticate" ) << i18n( "Smartcard" ); path << i18n( "Profile" ) << i18n( "Authenticate" ) << i18n( "Smartcard" );
@ -1131,8 +1131,8 @@ void PreferencesDialog::setupGui()
lo->addWidget( ProfileSmartcardSelectorWidget ); lo->addWidget( ProfileSmartcardSelectorWidget );
lo->addWidget( ProfileSmartcardOptionsWidget ); lo->addWidget( ProfileSmartcardOptionsWidget );
ProfileSmartcardSelector->setEnabled( true ); ProfileSmartcardSelector->setEnabled( true );
connect(ProfileSmartcardOptionsWidget->DetectPkcs11SlotsPushButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(detectPkcs11Slots())); connect(ProfileSmartcardOptionsWidget->DetectPkcs11SlotsPushButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(detectPkcs11Slots()));
connect(ProfileSmartcardOptionsWidget->DetectPkcs11IdPushButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(detectPkcs11Ids())); connect(ProfileSmartcardOptionsWidget->DetectPkcs11IdPushButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(detectPkcs11Ids()));
path.clear(); path.clear();
path << i18n( "Profile" ) << i18n( "Authenticate" ) << i18n( "PSK" ); path << i18n( "Profile" ) << i18n( "Authenticate" ) << i18n( "PSK" );
@ -1253,7 +1253,7 @@ void PreferencesDialog::setupGui()
lo->addWidget( ProfileNetworkVirtualIpSelectorWidget ); lo->addWidget( ProfileNetworkVirtualIpSelectorWidget );
lo->addWidget( ProfileNetworkVirtualIpOptionsWidget ); lo->addWidget( ProfileNetworkVirtualIpOptionsWidget );
ProfileNetworkVirtualIpSelector->setEnabled( true ); ProfileNetworkVirtualIpSelector->setEnabled( true );
connect(ProfileNetworkGeneralOptionsWidget->TunnelDeviceTypeComboBox, TQT_SIGNAL(activated ( const TQString & )),this, TQT_SLOT(tunnelDeviceTypeChanged(const TQString& ))); connect(ProfileNetworkGeneralOptionsWidget->TunnelDeviceTypeComboBox, TQ_SIGNAL(activated ( const TQString & )),this, TQ_SLOT(tunnelDeviceTypeChanged(const TQString& )));
path.clear(); path.clear();
path << i18n( "Profile" ) << i18n( "Connection specific" ) << i18n( "Cisco" ); path << i18n( "Profile" ) << i18n( "Connection specific" ) << i18n( "Cisco" );
@ -1274,12 +1274,12 @@ void PreferencesDialog::setupGui()
lo->addWidget( ProfileCiscoSelectorWidget ); lo->addWidget( ProfileCiscoSelectorWidget );
lo->addWidget( ProfileCiscoOptionsWidget ); lo->addWidget( ProfileCiscoOptionsWidget );
ProfileCiscoSelector->setEnabled( true ); ProfileCiscoSelector->setEnabled( true );
connect (ProfileCiscoOptionsWidget->LocalPortCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(localPortToggled(bool))); connect (ProfileCiscoOptionsWidget->LocalPortCheckbox, TQ_SIGNAL(toggled(bool)),this, TQ_SLOT(localPortToggled(bool)));
connect (ProfileCiscoOptionsWidget->ApplicationVersionCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(applicationVersionToggled(bool))); connect (ProfileCiscoOptionsWidget->ApplicationVersionCheckbox, TQ_SIGNAL(toggled(bool)),this, TQ_SLOT(applicationVersionToggled(bool)));
connect (ProfileCiscoOptionsWidget->PerfectForwardSecurityCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(perfectForwardSecurityToggled(bool))); connect (ProfileCiscoOptionsWidget->PerfectForwardSecurityCheckbox, TQ_SIGNAL(toggled(bool)),this, TQ_SLOT(perfectForwardSecurityToggled(bool)));
connect (ProfileCiscoOptionsWidget->IkeGroupCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(IkeGroupToggled(bool))); connect (ProfileCiscoOptionsWidget->IkeGroupCheckbox, TQ_SIGNAL(toggled(bool)),this, TQ_SLOT(IkeGroupToggled(bool)));
connect (ProfileCiscoOptionsWidget->SingleDesCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(singleDesToggled(bool))); connect (ProfileCiscoOptionsWidget->SingleDesCheckbox, TQ_SIGNAL(toggled(bool)),this, TQ_SLOT(singleDesToggled(bool)));
connect (ProfileCiscoOptionsWidget->EnableDpdIdleTimeoutCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(dpdToggled(bool))); connect (ProfileCiscoOptionsWidget->EnableDpdIdleTimeoutCheckbox, TQ_SIGNAL(toggled(bool)),this, TQ_SLOT(dpdToggled(bool)));
//ProfileCiscoOptionsWidget->PerfectForwardSecrecyCombobox->setEnabled( false ); //ProfileCiscoOptionsWidget->PerfectForwardSecrecyCombobox->setEnabled( false );
ProfileCiscoOptionsWidget->PerfectForwardSecrecyCombobox->clear(); ProfileCiscoOptionsWidget->PerfectForwardSecrecyCombobox->clear();
@ -1314,8 +1314,8 @@ void PreferencesDialog::setupGui()
ProfileRacoonOptionsWidget->ExchangeModeComboBox->insertItem( "aggressive", 1 ); ProfileRacoonOptionsWidget->ExchangeModeComboBox->insertItem( "aggressive", 1 );
ProfileRacoonOptionsWidget->ExchangeModeComboBox->insertItem( "base", 2 ); ProfileRacoonOptionsWidget->ExchangeModeComboBox->insertItem( "base", 2 );
ProfileRacoonOptionsWidget->ExchangeModeComboBox->setCurrentItem( 0 ); // main ProfileRacoonOptionsWidget->ExchangeModeComboBox->setCurrentItem( 0 ); // main
connect (ProfileRacoonOptionsWidget->PerfectForwardSecurityCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(perfectForwardSecurityToggled(bool))); connect (ProfileRacoonOptionsWidget->PerfectForwardSecurityCheckbox, TQ_SIGNAL(toggled(bool)),this, TQ_SLOT(perfectForwardSecurityToggled(bool)));
connect (ProfileRacoonOptionsWidget->IkeGroupCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(IkeGroupToggled(bool))); connect (ProfileRacoonOptionsWidget->IkeGroupCheckbox, TQ_SIGNAL(toggled(bool)),this, TQ_SLOT(IkeGroupToggled(bool)));
//ProfileRacoonOptionsWidget->PerfectForwardSecrecyCombobox->setEnabled( false ); //ProfileRacoonOptionsWidget->PerfectForwardSecrecyCombobox->setEnabled( false );
ProfileRacoonOptionsWidget->PerfectForwardSecrecyCombobox->clear(); ProfileRacoonOptionsWidget->PerfectForwardSecrecyCombobox->clear();
@ -1358,8 +1358,8 @@ void PreferencesDialog::setupGui()
ProfileIpsecSelectorLayout->addWidget( ProfileIpsecSelector ); ProfileIpsecSelectorLayout->addWidget( ProfileIpsecSelector );
ProfileIpsecOptionsWidget = new ProfileIpsecOptions( ProfileIpsecOptionsFrame ); ProfileIpsecOptionsWidget = new ProfileIpsecOptions( ProfileIpsecOptionsFrame );
connect (ProfileIpsecOptionsWidget->PerfectForwardSecurityCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(perfectForwardSecurityToggled(bool))); connect (ProfileIpsecOptionsWidget->PerfectForwardSecurityCheckbox, TQ_SIGNAL(toggled(bool)),this, TQ_SLOT(perfectForwardSecurityToggled(bool)));
connect (ProfileIpsecOptionsWidget->UseXauthCheckBox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(useXauthToggled(bool))); connect (ProfileIpsecOptionsWidget->UseXauthCheckBox, TQ_SIGNAL(toggled(bool)),this, TQ_SLOT(useXauthToggled(bool)));
ProfileIpsecOptionsWidget->IpsecVpnModeCombobox->insertItem( "transport" ); ProfileIpsecOptionsWidget->IpsecVpnModeCombobox->insertItem( "transport" );
ProfileIpsecOptionsWidget->IpsecVpnModeCombobox->insertItem( "tunnel" ); ProfileIpsecOptionsWidget->IpsecVpnModeCombobox->insertItem( "tunnel" );
@ -1596,43 +1596,43 @@ void PreferencesDialog::setupGui()
// enableButtonApply(false); // enableButtonApply(false);
/* connect profile combobox of each profile widget */ /* connect profile combobox of each profile widget */
connect( ProfileGeneralSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); connect( ProfileGeneralSelector, TQ_SIGNAL( activated ( const TQString& ) ), this, TQ_SLOT( profileChanged( const TQString& ) ) );
connect( ProfileNetworkRouteSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); connect( ProfileNetworkRouteSelector, TQ_SIGNAL( activated ( const TQString& ) ), this, TQ_SLOT( profileChanged( const TQString& ) ) );
connect( ProfileNetworkGeneralSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); connect( ProfileNetworkGeneralSelector, TQ_SIGNAL( activated ( const TQString& ) ), this, TQ_SLOT( profileChanged( const TQString& ) ) );
connect( ProfileNetworkNatSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); connect( ProfileNetworkNatSelector, TQ_SIGNAL( activated ( const TQString& ) ), this, TQ_SLOT( profileChanged( const TQString& ) ) );
connect( ProfileNetworkHttpProxySelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); connect( ProfileNetworkHttpProxySelector, TQ_SIGNAL( activated ( const TQString& ) ), this, TQ_SLOT( profileChanged( const TQString& ) ) );
connect( ProfileNetworkVirtualIpSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); connect( ProfileNetworkVirtualIpSelector, TQ_SIGNAL( activated ( const TQString& ) ), this, TQ_SLOT( profileChanged( const TQString& ) ) );
connect( ProfileCertSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); connect( ProfileCertSelector, TQ_SIGNAL( activated ( const TQString& ) ), this, TQ_SLOT( profileChanged( const TQString& ) ) );
connect( ProfileSmartcardSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); connect( ProfileSmartcardSelector, TQ_SIGNAL( activated ( const TQString& ) ), this, TQ_SLOT( profileChanged( const TQString& ) ) );
connect( ProfilePskSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); connect( ProfilePskSelector, TQ_SIGNAL( activated ( const TQString& ) ), this, TQ_SLOT( profileChanged( const TQString& ) ) );
connect( ProfileUserSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); connect( ProfileUserSelector, TQ_SIGNAL( activated ( const TQString& ) ), this, TQ_SLOT( profileChanged( const TQString& ) ) );
connect( ProfileOpenvpnSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); connect( ProfileOpenvpnSelector, TQ_SIGNAL( activated ( const TQString& ) ), this, TQ_SLOT( profileChanged( const TQString& ) ) );
connect( ProfilePptpSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); connect( ProfilePptpSelector, TQ_SIGNAL( activated ( const TQString& ) ), this, TQ_SLOT( profileChanged( const TQString& ) ) );
connect( ProfileRacoonSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); connect( ProfileRacoonSelector, TQ_SIGNAL( activated ( const TQString& ) ), this, TQ_SLOT( profileChanged( const TQString& ) ) );
connect( ProfileIpsecSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); connect( ProfileIpsecSelector, TQ_SIGNAL( activated ( const TQString& ) ), this, TQ_SLOT( profileChanged( const TQString& ) ) );
connect( ProfileCiscoSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); connect( ProfileCiscoSelector, TQ_SIGNAL( activated ( const TQString& ) ), this, TQ_SLOT( profileChanged( const TQString& ) ) );
connect( ProfileVtunSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); connect( ProfileVtunSelector, TQ_SIGNAL( activated ( const TQString& ) ), this, TQ_SLOT( profileChanged( const TQString& ) ) );
connect( ProfileSshSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); connect( ProfileSshSelector, TQ_SIGNAL( activated ( const TQString& ) ), this, TQ_SLOT( profileChanged( const TQString& ) ) );
connect( ProfileCmdExecBeforeConnectSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); connect( ProfileCmdExecBeforeConnectSelector, TQ_SIGNAL( activated ( const TQString& ) ), this, TQ_SLOT( profileChanged( const TQString& ) ) );
connect( ProfileCmdExecBeforeDisconnectSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); connect( ProfileCmdExecBeforeDisconnectSelector, TQ_SIGNAL( activated ( const TQString& ) ), this, TQ_SLOT( profileChanged( const TQString& ) ) );
connect( ProfileCmdExecAfterConnectSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); connect( ProfileCmdExecAfterConnectSelector, TQ_SIGNAL( activated ( const TQString& ) ), this, TQ_SLOT( profileChanged( const TQString& ) ) );
connect( ProfileCmdExecAfterDisconnectSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) ); connect( ProfileCmdExecAfterDisconnectSelector, TQ_SIGNAL( activated ( const TQString& ) ), this, TQ_SLOT( profileChanged( const TQString& ) ) );
connect( ProfileOpenvpnOptionsWidget->AuthWithUsernameAndPasswordCheckBox, TQT_SIGNAL( toggled ( bool ) ), this, TQT_SLOT( userAuthToggled( bool ) ) ); connect( ProfileOpenvpnOptionsWidget->AuthWithUsernameAndPasswordCheckBox, TQ_SIGNAL( toggled ( bool ) ), this, TQ_SLOT( userAuthToggled( bool ) ) );
// connect( ProfileCertOptionsWidget->UseSpecialServerSmartcardificateCheckBox, TQT_SIGNAL (toggled(bool)), TQT_SLOT(useSpecialServerSmartcardificateToggled(bool) ) ); // connect( ProfileCertOptionsWidget->UseSpecialServerSmartcardificateCheckBox, TQ_SIGNAL (toggled(bool)), TQ_SLOT(useSpecialServerSmartcardificateToggled(bool) ) );
connect( ProfileCertOptionsWidget->AuthTypeComboBox, TQT_SIGNAL( activated ( int ) ), this, TQT_SLOT( authTypeChanged( int ) ) ); connect( ProfileCertOptionsWidget->AuthTypeComboBox, TQ_SIGNAL( activated ( int ) ), this, TQ_SLOT( authTypeChanged( int ) ) );
connect( ProfilePskOptionsWidget->AuthTypeComboBox, TQT_SIGNAL( activated ( int ) ), this, TQT_SLOT( authTypeChanged( int ) ) ); connect( ProfilePskOptionsWidget->AuthTypeComboBox, TQ_SIGNAL( activated ( int ) ), this, TQ_SLOT( authTypeChanged( int ) ) );
// connect ( ProfileGeneralOptionsWidget->NewSessionPushButton , TQT_SIGNAL( clicked () ), this, TQT_SLOT( newSessionClicked() ) ); // connect ( ProfileGeneralOptionsWidget->NewSessionPushButton , TQ_SIGNAL( clicked () ), this, TQ_SLOT( newSessionClicked() ) );
connect ( ProfileGeneralOptionsWidget->SaveSessionPushButton, TQT_SIGNAL( clicked () ), this, TQT_SLOT( saveSessionClicked() ) ); connect ( ProfileGeneralOptionsWidget->SaveSessionPushButton, TQ_SIGNAL( clicked () ), this, TQ_SLOT( saveSessionClicked() ) );
connect ( ProfileGeneralOptionsWidget->RenameSessionPushButton, TQT_SIGNAL( clicked () ), this, TQT_SLOT( renameSessionClicked() ) ); connect ( ProfileGeneralOptionsWidget->RenameSessionPushButton, TQ_SIGNAL( clicked () ), this, TQ_SLOT( renameSessionClicked() ) );
connect ( ProfileGeneralOptionsWidget->DeleteSessionPushButton, TQT_SIGNAL( clicked () ), this, TQT_SLOT( deleteSessionClicked() ) ); connect ( ProfileGeneralOptionsWidget->DeleteSessionPushButton, TQ_SIGNAL( clicked () ), this, TQ_SLOT( deleteSessionClicked() ) );
connect ( this, TQT_SIGNAL( aboutToShowPage( TQWidget * ) ), this, TQT_SLOT( pageChanged( TQWidget * ) ) ); connect ( this, TQ_SIGNAL( aboutToShowPage( TQWidget * ) ), this, TQ_SLOT( pageChanged( TQWidget * ) ) );
connect ( this, TQT_SIGNAL( applyClicked () ), this, TQT_SLOT( saveSessionClicked() ) ); connect ( this, TQ_SIGNAL( applyClicked () ), this, TQ_SLOT( saveSessionClicked() ) );
} }
@ -2593,9 +2593,9 @@ void PreferencesDialog::profileChanged( const TQString& itemtext )
ProfileNetworkNatOptionsWidget->UdpPortCheckbox->setEnabled( false ); ProfileNetworkNatOptionsWidget->UdpPortCheckbox->setEnabled( false );
if ( it->getConnectionType() == VpnAccountData::openvpn ) if ( it->getConnectionType() == VpnAccountData::openvpn )
connect ( ProfileNetworkNatOptionsWidget->UseUdpCheckbox, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( useUdpToggled( bool ) ) ); connect ( ProfileNetworkNatOptionsWidget->UseUdpCheckbox, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( useUdpToggled( bool ) ) );
else else
disconnect ( ProfileNetworkNatOptionsWidget->UseUdpCheckbox, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( useUdpToggled( bool ) ) ); disconnect ( ProfileNetworkNatOptionsWidget->UseUdpCheckbox, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( useUdpToggled( bool ) ) );
ProfileNetworkGeneralOptionsWidget->MtuCheckbox->setChecked( it->getUseMtu() ); ProfileNetworkGeneralOptionsWidget->MtuCheckbox->setChecked( it->getUseMtu() );

2
src/profilenetworkrouteoptions.cpp
Unescape View File

@ -201,7 +201,7 @@ void ProfileNetworkRouteOptions::contextMenuRequested ( TQListViewItem * item, c
ContextMenu->insertItem(i18n("&Delete...")); ContextMenu->insertItem(i18n("&Delete..."));
} }
ContextMenu->insertItem(i18n("&Add...")); ContextMenu->insertItem(i18n("&Add..."));
connect ( ContextMenu, TQT_SIGNAL ( activated ( int ) ), this, TQT_SLOT ( doContextMenuAction ( int ) ) ); connect ( ContextMenu, TQ_SIGNAL ( activated ( int ) ), this, TQ_SLOT ( doContextMenuAction ( int ) ) );
ContextMenu->show(); ContextMenu->show();
ContextMenu->setGeometry(pos.x(),pos.y(), ContextMenu->width(),ContextMenu->height()); ContextMenu->setGeometry(pos.x(),pos.y(), ContextMenu->width(),ContextMenu->height());
} }

28
src/toolinfo.cpp
Unescape View File

@ -110,9 +110,9 @@ bool ToolInfo::collectToolInfo()
CollectToolInfoProcess = new TQProcess(this); CollectToolInfoProcess = new TQProcess(this);
CollectToolInfoProcess->clearArguments(); CollectToolInfoProcess->clearArguments();
connect( CollectToolInfoProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutCollectToolInfo() ) ); connect( CollectToolInfoProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutCollectToolInfo() ) );
connect( CollectToolInfoProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrCollectToolInfo() ) ); connect( CollectToolInfoProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrCollectToolInfo() ) );
//connect( CollectToolInfoProcess, TQT_SIGNAL( processExited () ), this, TQT_SLOT(processFinished() ) ); //connect( CollectToolInfoProcess, TQ_SIGNAL( processExited () ), this, TQ_SLOT(processFinished() ) );
bool run=true; bool run=true;
//FIXME how it could be better? //FIXME how it could be better?
@ -217,15 +217,15 @@ bool ToolInfo::collectToolInfo()
} }
//KMessageBox::information(0,TQString("Name: "+Name+", Path: "+PathToExec+", Version: "+Version),"aaa"); //KMessageBox::information(0,TQString("Name: "+Name+", Path: "+PathToExec+", Version: "+Version),"aaa");
// disconnect( CollectToolInfoProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutCollectToolInfo() ) ); // disconnect( CollectToolInfoProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutCollectToolInfo() ) );
// disconnect( CollectToolInfoProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrCollectToolInfo() ) ); // disconnect( CollectToolInfoProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrCollectToolInfo() ) );
// delete CollectToolInfoProcess; // delete CollectToolInfoProcess;
success=true; success=true;
} }
} }
disconnect( CollectToolInfoProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutCollectToolInfo() ) ); disconnect( CollectToolInfoProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutCollectToolInfo() ) );
disconnect( CollectToolInfoProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrCollectToolInfo() ) ); disconnect( CollectToolInfoProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrCollectToolInfo() ) );
delete CollectToolInfoProcess; delete CollectToolInfoProcess;
CollectToolInfoProcess=0L; CollectToolInfoProcess=0L;
@ -251,9 +251,9 @@ void ToolInfo::getOpenvpnCapabilities()
CollectOpenvpnCapabilitiesProcess = new TQProcess(this); CollectOpenvpnCapabilitiesProcess = new TQProcess(this);
CollectOpenvpnCapabilitiesProcess->clearArguments(); CollectOpenvpnCapabilitiesProcess->clearArguments();
connect( CollectOpenvpnCapabilitiesProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutCollectOpenvpnCapabilies() ) ); connect( CollectOpenvpnCapabilitiesProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutCollectOpenvpnCapabilies() ) );
connect( CollectOpenvpnCapabilitiesProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrCollectOpenvpnCapabilies() ) ); connect( CollectOpenvpnCapabilitiesProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrCollectOpenvpnCapabilies() ) );
connect( CollectOpenvpnCapabilitiesProcess, TQT_SIGNAL( processExited () ), this, TQT_SLOT(processFinished() ) ); connect( CollectOpenvpnCapabilitiesProcess, TQ_SIGNAL( processExited () ), this, TQ_SLOT(processFinished() ) );
//FIXME how it could be better? //FIXME how it could be better?
CollectOpenvpnCapabilitiesProcess->addArgument(PathToExec); CollectOpenvpnCapabilitiesProcess->addArgument(PathToExec);
@ -278,13 +278,13 @@ void ToolInfo::getOpenvpnCapabilities()
} }
//KMessageBox::information(0,TQString("Name: "+Name+", Path: "+PathToExec+", Version: "+Version),"aaa"); //KMessageBox::information(0,TQString("Name: "+Name+", Path: "+PathToExec+", Version: "+Version),"aaa");
// disconnect( CollectOpenvpnCapabilitiesProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutCollectOpenvpnCapabilies() ) ); // disconnect( CollectOpenvpnCapabilitiesProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutCollectOpenvpnCapabilies() ) );
// disconnect( CollectOpenvpnCapabilitiesProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrCollectOpenvpnCapabilies() ) ); // disconnect( CollectOpenvpnCapabilitiesProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrCollectOpenvpnCapabilies() ) );
// delete CollectOpenvpnCapabilitiesProcess; // delete CollectOpenvpnCapabilitiesProcess;
} }
disconnect( CollectOpenvpnCapabilitiesProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutCollectOpenvpnCapabilies() ) ); disconnect( CollectOpenvpnCapabilitiesProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutCollectOpenvpnCapabilies() ) );
disconnect( CollectOpenvpnCapabilitiesProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrCollectOpenvpnCapabilies() ) ); disconnect( CollectOpenvpnCapabilitiesProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrCollectOpenvpnCapabilies() ) );
//std::cout << "Name: " << Name << ", Path: " << PathToExec << ", Version: " << Version << std::endl; //std::cout << "Name: " << Name << ", Path: " << PathToExec << ", Version: " << Version << std::endl;

160
src/utils.cpp
Unescape View File

@ -144,8 +144,8 @@ bool Utils::tunDevExists()
bool Utils::createTunDev() bool Utils::createTunDev()
{ {
createProcess = new TQProcess( this ); createProcess = new TQProcess( this );
connect( createProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutCreateTunDev() ) ); connect( createProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutCreateTunDev() ) );
connect( createProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrCreateTunDev() ) ); connect( createProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrCreateTunDev() ) );
// step one: create directory // step one: create directory
if ( !TQDir ( "/dev/net" ).exists() ) if ( !TQDir ( "/dev/net" ).exists() )
@ -156,8 +156,8 @@ bool Utils::createTunDev()
if ( !createProcess->start(env) ) { if ( !createProcess->start(env) ) {
disconnect( createProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutCreateTunDev() ) ); disconnect( createProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutCreateTunDev() ) );
disconnect( createProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrCreateTunDev() ) ); disconnect( createProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrCreateTunDev() ) );
delete createProcess; delete createProcess;
createProcess=0L; createProcess=0L;
kdError() << "Unable to create tunnel device file!" << endl; kdError() << "Unable to create tunnel device file!" << endl;
@ -181,8 +181,8 @@ bool Utils::createTunDev()
if ( !createProcess->start(env) ) if ( !createProcess->start(env) )
{ {
disconnect( createProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutCreateTunDev() ) ); disconnect( createProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutCreateTunDev() ) );
disconnect( createProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrCreateTunDev() ) ); disconnect( createProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrCreateTunDev() ) );
delete createProcess; delete createProcess;
createProcess = 0L; createProcess = 0L;
kdError() << "Unable to create tunnel device file!" << endl; kdError() << "Unable to create tunnel device file!" << endl;
@ -194,8 +194,8 @@ bool Utils::createTunDev()
{ {
sleep ( 1 ); sleep ( 1 );
} }
disconnect( createProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutCreateTunDev() ) ); disconnect( createProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutCreateTunDev() ) );
disconnect( createProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrCreateTunDev() ) ); disconnect( createProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrCreateTunDev() ) );
delete createProcess; delete createProcess;
createProcess = 0L; createProcess = 0L;
return true; return true;
@ -212,11 +212,11 @@ bool Utils::loadKernelModule( TQString Name, TQApplication *app )
ModprobeProcess->addArgument( "/sbin/modprobe" ); ModprobeProcess->addArgument( "/sbin/modprobe" );
ModprobeProcess->addArgument( Name ); ModprobeProcess->addArgument( Name );
connect( ModprobeProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutLoadKernelModule() ) ); connect( ModprobeProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutLoadKernelModule() ) );
connect( ModprobeProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrLoadKernelModule() ) ); connect( ModprobeProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrLoadKernelModule() ) );
if ( !ModprobeProcess->start( env ) ) { if ( !ModprobeProcess->start( env ) ) {
disconnect( ModprobeProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutLoadKernelModule() ) ); disconnect( ModprobeProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutLoadKernelModule() ) );
disconnect( ModprobeProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrLoadKernelModule() ) ); disconnect( ModprobeProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrLoadKernelModule() ) );
delete ModprobeProcess; delete ModprobeProcess;
ModprobeProcess = 0L; ModprobeProcess = 0L;
return modprobeSuccess; return modprobeSuccess;
@ -231,8 +231,8 @@ bool Utils::loadKernelModule( TQString Name, TQApplication *app )
config->appPointer->processEvents(); config->appPointer->processEvents();
usleep(250); usleep(250);
} }
disconnect( ModprobeProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutLoadKernelModule() ) ); disconnect( ModprobeProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutLoadKernelModule() ) );
disconnect( ModprobeProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrLoadKernelModule() ) ); disconnect( ModprobeProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrLoadKernelModule() ) );
delete ModprobeProcess; delete ModprobeProcess;
ModprobeProcess = 0L; ModprobeProcess = 0L;
return modprobeSuccess; return modprobeSuccess;
@ -256,11 +256,11 @@ bool Utils::unloadKernelModule( TQString Name, TQApplication *app , bool force)
ModprobeProcess->addArgument( Name ); ModprobeProcess->addArgument( Name );
connect( ModprobeProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutLoadKernelModule() ) ); connect( ModprobeProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutLoadKernelModule() ) );
connect( ModprobeProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrLoadKernelModule() ) ); connect( ModprobeProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrLoadKernelModule() ) );
if ( !ModprobeProcess->start( env ) ) { if ( !ModprobeProcess->start( env ) ) {
disconnect( ModprobeProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutLoadKernelModule() ) ); disconnect( ModprobeProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutLoadKernelModule() ) );
disconnect( ModprobeProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrLoadKernelModule() ) ); disconnect( ModprobeProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrLoadKernelModule() ) );
delete ModprobeProcess; delete ModprobeProcess;
ModprobeProcess = 0L; ModprobeProcess = 0L;
return modprobeSuccess; return modprobeSuccess;
@ -275,8 +275,8 @@ bool Utils::unloadKernelModule( TQString Name, TQApplication *app , bool force)
config->appPointer->processEvents(); config->appPointer->processEvents();
usleep(250); usleep(250);
} }
disconnect( ModprobeProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutLoadKernelModule() ) ); disconnect( ModprobeProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutLoadKernelModule() ) );
disconnect( ModprobeProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrLoadKernelModule() ) ); disconnect( ModprobeProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrLoadKernelModule() ) );
delete ModprobeProcess; delete ModprobeProcess;
ModprobeProcess = 0L; ModprobeProcess = 0L;
return modprobeSuccess; return modprobeSuccess;
@ -514,13 +514,13 @@ TQStringList Utils::getOpenvpnCiphers()
OpenvpnCiphersProcess->addArgument( pathToOpenvpn ); OpenvpnCiphersProcess->addArgument( pathToOpenvpn );
OpenvpnCiphersProcess->addArgument( "--show-ciphers" ); OpenvpnCiphersProcess->addArgument( "--show-ciphers" );
connect( OpenvpnCiphersProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutRetriveOpenvpnCiphers() ) ); connect( OpenvpnCiphersProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutRetriveOpenvpnCiphers() ) );
connect( OpenvpnCiphersProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrRetriveOpenvpnCiphers() ) ); connect( OpenvpnCiphersProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrRetriveOpenvpnCiphers() ) );
if ( !OpenvpnCiphersProcess->start( env ) ) { if ( !OpenvpnCiphersProcess->start( env ) ) {
disconnect( OpenvpnCiphersProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutRetriveOpenvpnCiphers() ) ); disconnect( OpenvpnCiphersProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutRetriveOpenvpnCiphers() ) );
disconnect( OpenvpnCiphersProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrRetriveOpenvpnCiphers() ) ); disconnect( OpenvpnCiphersProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrRetriveOpenvpnCiphers() ) );
delete OpenvpnCiphersProcess; delete OpenvpnCiphersProcess;
OpenvpnCiphersProcess=0L; OpenvpnCiphersProcess=0L;
kdError() << "Unable to fetch openvpn ciphers!" << endl; kdError() << "Unable to fetch openvpn ciphers!" << endl;
@ -533,8 +533,8 @@ TQStringList Utils::getOpenvpnCiphers()
config->appPointer->processEvents(); config->appPointer->processEvents();
sleep ( 1 ); sleep ( 1 );
} }
disconnect( OpenvpnCiphersProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutRetriveOpenvpnCiphers() ) ); disconnect( OpenvpnCiphersProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutRetriveOpenvpnCiphers() ) );
disconnect( OpenvpnCiphersProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrRetriveOpenvpnCiphers() ) ); disconnect( OpenvpnCiphersProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrRetriveOpenvpnCiphers() ) );
delete OpenvpnCiphersProcess; delete OpenvpnCiphersProcess;
OpenvpnCiphersProcess=0L; OpenvpnCiphersProcess=0L;
} }
@ -565,12 +565,12 @@ Utils::IpsecAlgos Utils::getIpsecAlgos()
IpsecAlgosProcess->addArgument( "auto" ); IpsecAlgosProcess->addArgument( "auto" );
IpsecAlgosProcess->addArgument( "--status" ); IpsecAlgosProcess->addArgument( "--status" );
connect( IpsecAlgosProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutRetriveIpsecAlgos() ) ); connect( IpsecAlgosProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutRetriveIpsecAlgos() ) );
connect( IpsecAlgosProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrRetriveIpsecAlgos() ) ); connect( IpsecAlgosProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrRetriveIpsecAlgos() ) );
if ( !IpsecAlgosProcess->start( env ) ) { if ( !IpsecAlgosProcess->start( env ) ) {
disconnect( IpsecAlgosProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutRetriveIpsecAlgos() ) ); disconnect( IpsecAlgosProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutRetriveIpsecAlgos() ) );
disconnect( IpsecAlgosProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrRetriveIpsecAlgos() ) ); disconnect( IpsecAlgosProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrRetriveIpsecAlgos() ) );
delete IpsecAlgosProcess; delete IpsecAlgosProcess;
IpsecAlgosProcess=0L; IpsecAlgosProcess=0L;
kdError() << "Unable to fetch ipsec algos!" << endl; kdError() << "Unable to fetch ipsec algos!" << endl;
@ -583,8 +583,8 @@ Utils::IpsecAlgos Utils::getIpsecAlgos()
config->appPointer->processEvents(); config->appPointer->processEvents();
sleep ( 1 ); sleep ( 1 );
} }
disconnect( IpsecAlgosProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutRetriveIpsecAlgos() ) ); disconnect( IpsecAlgosProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutRetriveIpsecAlgos() ) );
disconnect( IpsecAlgosProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrRetriveIpsecAlgos() ) ); disconnect( IpsecAlgosProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrRetriveIpsecAlgos() ) );
delete IpsecAlgosProcess; delete IpsecAlgosProcess;
IpsecAlgosProcess=0L; IpsecAlgosProcess=0L;
} }
@ -743,8 +743,8 @@ Utils::PppdCapabilities Utils::checkPppdCapabilities()
TestPppdProcess->setCommunication ( TQProcess::Stdin | TQProcess::Stdout | TQProcess::Stderr | TQProcess::DupStderr ); TestPppdProcess->setCommunication ( TQProcess::Stdin | TQProcess::Stdout | TQProcess::Stderr | TQProcess::DupStderr );
TestPppdProcess->closeStdin (); TestPppdProcess->closeStdin ();
connect ( TestPppdProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readPppdtestProcessOutput() ) ); connect ( TestPppdProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readPppdtestProcessOutput() ) );
// connect ( TestPppdProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readPppdtestProcessOutput() ) ); // connect ( TestPppdProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readPppdtestProcessOutput() ) );
if ( !TestPppdProcess->start ( env ) ) if ( !TestPppdProcess->start ( env ) )
{ {
@ -772,8 +772,8 @@ Utils::PppdCapabilities Utils::checkPppdCapabilities()
config->appendLogEntry ( "pppdHasRequireMppeSupport: false", config->debug ); config->appendLogEntry ( "pppdHasRequireMppeSupport: false", config->debug );
} }
disconnect ( TestPppdProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readPppdtestProcessOutput() ) ); disconnect ( TestPppdProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readPppdtestProcessOutput() ) );
// disconnect ( TestPppdProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readPppdtestProcessOutput() ) ); // disconnect ( TestPppdProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readPppdtestProcessOutput() ) );
delete TestPppdProcess; delete TestPppdProcess;
TestPppdProcess=0L; TestPppdProcess=0L;
@ -790,8 +790,8 @@ Utils::PppdCapabilities Utils::checkPppdCapabilities()
TestPppdProcess->setCommunication ( TQProcess::Stdin | TQProcess::Stdout | TQProcess::Stderr | TQProcess::DupStderr ); TestPppdProcess->setCommunication ( TQProcess::Stdin | TQProcess::Stdout | TQProcess::Stderr | TQProcess::DupStderr );
TestPppdProcess->closeStdin (); TestPppdProcess->closeStdin ();
connect ( TestPppdProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readPppdtestProcessOutput() ) ); connect ( TestPppdProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readPppdtestProcessOutput() ) );
// connect ( TestPppdProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readPppdtestProcessOutput() ) ); // connect ( TestPppdProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readPppdtestProcessOutput() ) );
if ( !TestPppdProcess->start ( env ) ) if ( !TestPppdProcess->start ( env ) )
{ {
@ -826,8 +826,8 @@ Utils::PppdCapabilities Utils::checkPppdCapabilities()
config->appendLogEntry ( "PppdMppeRequired: false", config->debug ); config->appendLogEntry ( "PppdMppeRequired: false", config->debug );
} }
disconnect ( TestPppdProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readPppdtestProcessOutput() ) ); disconnect ( TestPppdProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readPppdtestProcessOutput() ) );
// disconnect ( TestPppdProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readPppdtestProcessOutput() ) ); // disconnect ( TestPppdProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readPppdtestProcessOutput() ) );
delete TestPppdProcess; delete TestPppdProcess;
testPppdMppeRequired=false; testPppdMppeRequired=false;
@ -858,8 +858,8 @@ Utils::PppdCapabilities Utils::checkPppdCapabilities()
TestPppdProcess->setCommunication ( TQProcess::Stdin | TQProcess::Stdout | TQProcess::Stderr | TQProcess::DupStderr ); TestPppdProcess->setCommunication ( TQProcess::Stdin | TQProcess::Stdout | TQProcess::Stderr | TQProcess::DupStderr );
TestPppdProcess->closeStdin (); TestPppdProcess->closeStdin ();
connect ( TestPppdProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readPppdtestProcessOutput() ) ); connect ( TestPppdProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readPppdtestProcessOutput() ) );
connect ( TestPppdProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readPppdtestProcessOutput() ) ); connect ( TestPppdProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readPppdtestProcessOutput() ) );
if ( !TestPppdProcess->start ( env ) ) if ( !TestPppdProcess->start ( env ) )
@ -887,8 +887,8 @@ Utils::PppdCapabilities Utils::checkPppdCapabilities()
config->appendLogEntry ( i18n ( "Test support of replacedefaultroute pppd: %1" ).arg ( i18n ( "failed" ) ) , config->debug ); config->appendLogEntry ( i18n ( "Test support of replacedefaultroute pppd: %1" ).arg ( i18n ( "failed" ) ) , config->debug );
} }
} }
disconnect ( TestPppdProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readPppdtestProcessOutput() ) ); disconnect ( TestPppdProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readPppdtestProcessOutput() ) );
disconnect ( TestPppdProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readPppdtestProcessOutput() ) ); disconnect ( TestPppdProcess, TQ_SIGNAL ( readyReadStderr() ), this, TQ_SLOT ( readPppdtestProcessOutput() ) );
delete TestPppdProcess; delete TestPppdProcess;
TestPppdProcess=0L; TestPppdProcess=0L;
@ -912,12 +912,12 @@ TQStringList Utils::getOpenvpnDigests()
OpenvpnDigestProcess->addArgument( pathToOpenvpn ); OpenvpnDigestProcess->addArgument( pathToOpenvpn );
OpenvpnDigestProcess->addArgument( "--show-digests" ); OpenvpnDigestProcess->addArgument( "--show-digests" );
connect( OpenvpnDigestProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutRetriveOpenvpnDigests() ) ); connect( OpenvpnDigestProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutRetriveOpenvpnDigests() ) );
connect( OpenvpnDigestProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrRetriveOpenvpnDigests() ) ); connect( OpenvpnDigestProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrRetriveOpenvpnDigests() ) );
if ( !OpenvpnDigestProcess->start( env ) ) { if ( !OpenvpnDigestProcess->start( env ) ) {
disconnect( OpenvpnDigestProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutRetriveOpenvpnDigests() ) ); disconnect( OpenvpnDigestProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutRetriveOpenvpnDigests() ) );
disconnect( OpenvpnDigestProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrRetriveOpenvpnDigests() ) ); disconnect( OpenvpnDigestProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrRetriveOpenvpnDigests() ) );
delete OpenvpnDigestProcess; delete OpenvpnDigestProcess;
OpenvpnDigestProcess=0L; OpenvpnDigestProcess=0L;
kdError() << "Unable to fetch openvpn digests!" << endl; kdError() << "Unable to fetch openvpn digests!" << endl;
@ -938,8 +938,8 @@ TQStringList Utils::getOpenvpnDigests()
*it = TQString(*it).section(' ',0,0); *it = TQString(*it).section(' ',0,0);
} }
disconnect( OpenvpnDigestProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutRetriveOpenvpnDigests() ) ); disconnect( OpenvpnDigestProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutRetriveOpenvpnDigests() ) );
disconnect( OpenvpnDigestProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrRetriveOpenvpnDigests() ) ); disconnect( OpenvpnDigestProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrRetriveOpenvpnDigests() ) );
delete OpenvpnDigestProcess; delete OpenvpnDigestProcess;
OpenvpnDigestProcess=0L; OpenvpnDigestProcess=0L;
return OpenvpnDigests; return OpenvpnDigests;
@ -1027,12 +1027,12 @@ TQString Utils::getNameAndPidOfProgramListen( int port )
NameAndPidOfProgramListenProcess->addArgument( config->pathToNetstat ); NameAndPidOfProgramListenProcess->addArgument( config->pathToNetstat );
NameAndPidOfProgramListenProcess->addArgument( "-ntupl" ); NameAndPidOfProgramListenProcess->addArgument( "-ntupl" );
connect( NameAndPidOfProgramListenProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutGetNameAndPidOfProgramListen() ) ); connect( NameAndPidOfProgramListenProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutGetNameAndPidOfProgramListen() ) );
connect( NameAndPidOfProgramListenProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrGetNameAndPidOfProgramListen() ) ); connect( NameAndPidOfProgramListenProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrGetNameAndPidOfProgramListen() ) );
if ( !NameAndPidOfProgramListenProcess->start( env ) ) { if ( !NameAndPidOfProgramListenProcess->start( env ) ) {
disconnect( NameAndPidOfProgramListenProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutGetNameAndPidOfProgramListen() ) ); disconnect( NameAndPidOfProgramListenProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutGetNameAndPidOfProgramListen() ) );
disconnect( NameAndPidOfProgramListenProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrGetNameAndPidOfProgramListen() ) ); disconnect( NameAndPidOfProgramListenProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrGetNameAndPidOfProgramListen() ) );
delete NameAndPidOfProgramListenProcess; delete NameAndPidOfProgramListenProcess;
NameAndPidOfProgramListenProcess=0L; NameAndPidOfProgramListenProcess=0L;
kdError() << "netstat fails!" << endl; kdError() << "netstat fails!" << endl;
@ -1047,8 +1047,8 @@ TQString Utils::getNameAndPidOfProgramListen( int port )
} }
disconnect( NameAndPidOfProgramListenProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutGetNameAndPidOfProgramListen() ) ); disconnect( NameAndPidOfProgramListenProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutGetNameAndPidOfProgramListen() ) );
disconnect( NameAndPidOfProgramListenProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrGetNameAndPidOfProgramListen() ) ); disconnect( NameAndPidOfProgramListenProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrGetNameAndPidOfProgramListen() ) );
delete NameAndPidOfProgramListenProcess; delete NameAndPidOfProgramListenProcess;
NameAndPidOfProgramListenProcess=0L; NameAndPidOfProgramListenProcess=0L;
} }
@ -1069,10 +1069,10 @@ TQString Utils::getEmailAddressOfCert(TQString cert)
GetEmailAddressOfCertProcess->addArgument( cert ); GetEmailAddressOfCertProcess->addArgument( cert );
GetEmailAddressOfCertProcess->addArgument( "-subject"); GetEmailAddressOfCertProcess->addArgument( "-subject");
connect( GetEmailAddressOfCertProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutGetEmailAddressOfCert() ) ); connect( GetEmailAddressOfCertProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readOutGetEmailAddressOfCert() ) );
if ( !GetEmailAddressOfCertProcess->start( env ) ) { if ( !GetEmailAddressOfCertProcess->start( env ) ) {
disconnect( GetEmailAddressOfCertProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutGetEmailAddressOfCert() ) ); disconnect( GetEmailAddressOfCertProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readOutGetEmailAddressOfCert() ) );
delete GetEmailAddressOfCertProcess; delete GetEmailAddressOfCertProcess;
GetEmailAddressOfCertProcess=0L; GetEmailAddressOfCertProcess=0L;
kdError() << "GetEmailAddressOfCertProcess" << endl; kdError() << "GetEmailAddressOfCertProcess" << endl;
@ -1085,7 +1085,7 @@ TQString Utils::getEmailAddressOfCert(TQString cert)
config->appPointer->processEvents(); config->appPointer->processEvents();
sleep ( 1 ); sleep ( 1 );
} }
disconnect( GetEmailAddressOfCertProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutGetEmailAddressOfCert() ) ); disconnect( GetEmailAddressOfCertProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readOutGetEmailAddressOfCert() ) );
delete GetEmailAddressOfCertProcess; delete GetEmailAddressOfCertProcess;
GetEmailAddressOfCertProcess=0L; GetEmailAddressOfCertProcess=0L;
} }
@ -1117,11 +1117,11 @@ TQStringList Utils::getSmartcardSlots(TQString ProviderLib)
} }
*GetSmartcardSlotsProcess << "-L" ; *GetSmartcardSlotsProcess << "-L" ;
connect( GetSmartcardSlotsProcess, TQT_SIGNAL( receivedStdout ( TDEProcess *, char *, int)), this, TQT_SLOT(readOutGetSmartcardSlots())); connect( GetSmartcardSlotsProcess, TQ_SIGNAL( receivedStdout ( TDEProcess *, char *, int)), this, TQ_SLOT(readOutGetSmartcardSlots()));
if ( !GetSmartcardSlotsProcess->start ( TDEProcess::NotifyOnExit, TDEProcess::All ) ) if ( !GetSmartcardSlotsProcess->start ( TDEProcess::NotifyOnExit, TDEProcess::All ) )
{ {
disconnect( GetSmartcardSlotsProcess, TQT_SIGNAL( receivedStdout ( TDEProcess *, char *, int)), this, TQT_SLOT(readOutGetSmartcardSlots())); disconnect( GetSmartcardSlotsProcess, TQ_SIGNAL( receivedStdout ( TDEProcess *, char *, int)), this, TQ_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 ( TDEProcess *, char *, int)), this, TQT_SLOT(readOutGetSmartcardSlots())); disconnect( GetSmartcardSlotsProcess, TQ_SIGNAL( receivedStdout ( TDEProcess *, char *, int)), this, TQ_SLOT(readOutGetSmartcardSlots()));
delete GetSmartcardSlotsProcess; delete GetSmartcardSlotsProcess;
GetSmartcardCertsFromSlotProcess=0L; GetSmartcardCertsFromSlotProcess=0L;
if (config->KvpncDebugLevel > 5) if (config->KvpncDebugLevel > 5)
@ -1184,10 +1184,10 @@ TQStringList Utils::getSmartcardCertsFromSlot(TQString slot,TQString IdType,TQSt
else else
GetSmartcardCertsFromSlotProcess->addArgument("0"); GetSmartcardCertsFromSlotProcess->addArgument("0");
connect( GetSmartcardCertsFromSlotProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutGetSmartcardCertsFromSlot() ) ); connect( GetSmartcardCertsFromSlotProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readOutGetSmartcardCertsFromSlot() ) );
if ( !GetSmartcardCertsFromSlotProcess->start( env ) ) { if ( !GetSmartcardCertsFromSlotProcess->start( env ) ) {
disconnect( GetSmartcardCertsFromSlotProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutGetSmartcardCertsFromSlot() ) ); disconnect( GetSmartcardCertsFromSlotProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readOutGetSmartcardCertsFromSlot() ) );
delete GetSmartcardCertsFromSlotProcess; delete GetSmartcardCertsFromSlotProcess;
GetSmartcardCertsFromSlotProcess=0L; GetSmartcardCertsFromSlotProcess=0L;
kdError() << "Unable to fetch smartcard slots via pkcs11-tool!" << endl; kdError() << "Unable to fetch smartcard slots via pkcs11-tool!" << endl;
@ -1201,7 +1201,7 @@ TQStringList Utils::getSmartcardCertsFromSlot(TQString slot,TQString IdType,TQSt
usleep ( 500 ); usleep ( 500 );
config->appPointer->processEvents(); config->appPointer->processEvents();
} }
disconnect( GetSmartcardCertsFromSlotProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutGetSmartcardCertsFromSlot() ) ); disconnect( GetSmartcardCertsFromSlotProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readOutGetSmartcardCertsFromSlot() ) );
delete GetSmartcardCertsFromSlotProcess; delete GetSmartcardCertsFromSlotProcess;
GetSmartcardCertsFromSlotProcess=0L; GetSmartcardCertsFromSlotProcess=0L;
} }
@ -1240,11 +1240,11 @@ TQStringList Utils::getCertsFromCiscoCertStore(TQString type)
GetCertsFromCiscoCertStoreProcess->addArgument( "list"); GetCertsFromCiscoCertStoreProcess->addArgument( "list");
connect( GetCertsFromCiscoCertStoreProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutGetCertsFromCiscoCertStoreSlot() ) ); connect( GetCertsFromCiscoCertStoreProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readOutGetCertsFromCiscoCertStoreSlot() ) );
if ( !GetCertsFromCiscoCertStoreProcess->start( env ) ) if ( !GetCertsFromCiscoCertStoreProcess->start( env ) )
{ {
disconnect( GetCertsFromCiscoCertStoreProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutGetCertsFromCiscoCertStoreSlot() ) ); disconnect( GetCertsFromCiscoCertStoreProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readOutGetCertsFromCiscoCertStoreSlot() ) );
delete GetCertsFromCiscoCertStoreProcess; delete GetCertsFromCiscoCertStoreProcess;
GetCertsFromCiscoCertStoreProcess=0L; GetCertsFromCiscoCertStoreProcess=0L;
kdError() << "Unable to fetch certificates via cisco_cert_mgr!" << endl; kdError() << "Unable to fetch certificates via cisco_cert_mgr!" << endl;
@ -1259,7 +1259,7 @@ TQStringList Utils::getCertsFromCiscoCertStore(TQString type)
if ( config->appPointer->hasPendingEvents () ) if ( config->appPointer->hasPendingEvents () )
config->appPointer->processEvents(); config->appPointer->processEvents();
} }
disconnect( GetCertsFromCiscoCertStoreProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutGetCertsFromCiscoCertStoreSlot() ) ); disconnect( GetCertsFromCiscoCertStoreProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readOutGetCertsFromCiscoCertStoreSlot() ) );
delete GetCertsFromCiscoCertStoreProcess; delete GetCertsFromCiscoCertStoreProcess;
GetCertsFromCiscoCertStoreProcess=0L; GetCertsFromCiscoCertStoreProcess=0L;
} }
@ -1280,10 +1280,10 @@ TQStringList Utils::getOpenvpnPkcs11Ids(TQString ProviderLib)
OpenvpnPkcs11IdsProcess->addArgument( ProviderLib ); OpenvpnPkcs11IdsProcess->addArgument( ProviderLib );
connect( OpenvpnPkcs11IdsProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutGetOpenvpnPkcs11Ids() ) ); connect( OpenvpnPkcs11IdsProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readOutGetOpenvpnPkcs11Ids() ) );
if ( !OpenvpnPkcs11IdsProcess->start( env ) ) { if ( !OpenvpnPkcs11IdsProcess->start( env ) ) {
disconnect( OpenvpnPkcs11IdsProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutGetOpenvpnPkcs11Ids() ) ); disconnect( OpenvpnPkcs11IdsProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readOutGetOpenvpnPkcs11Ids() ) );
delete OpenvpnPkcs11IdsProcess; delete OpenvpnPkcs11IdsProcess;
OpenvpnPkcs11IdsProcess=0L; OpenvpnPkcs11IdsProcess=0L;
kdError() << "Unable to fetch pkcs11 ids via openvpn!" << endl; kdError() << "Unable to fetch pkcs11 ids via openvpn!" << endl;
@ -1297,7 +1297,7 @@ TQStringList Utils::getOpenvpnPkcs11Ids(TQString ProviderLib)
usleep ( 500 ); usleep ( 500 );
config->appPointer->processEvents(); config->appPointer->processEvents();
} }
disconnect( OpenvpnPkcs11IdsProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutGetOpenvpnPkcs11Ids() ) ); disconnect( OpenvpnPkcs11IdsProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readOutGetOpenvpnPkcs11Ids() ) );
delete OpenvpnPkcs11IdsProcess; delete OpenvpnPkcs11IdsProcess;
OpenvpnPkcs11IdsProcess=0L; OpenvpnPkcs11IdsProcess=0L;
} }
@ -1334,10 +1334,10 @@ bool Utils::getNeedsPassphrase(TQString key)
NeedsPassphraseProcess->addArgument("pass:aaa"); NeedsPassphraseProcess->addArgument("pass:aaa");
connect( NeedsPassphraseProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutNeedsPassphrase() ) ); connect( NeedsPassphraseProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readOutNeedsPassphrase() ) );
if ( !NeedsPassphraseProcess->start( env ) ) { if ( !NeedsPassphraseProcess->start( env ) ) {
disconnect( NeedsPassphraseProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutNeedsPassphrase() ) ); disconnect( NeedsPassphraseProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readOutNeedsPassphrase() ) );
delete NetworkDeviceTestProcess; delete NetworkDeviceTestProcess;
NeedsPassphraseProcess=0L; NeedsPassphraseProcess=0L;
kdError() << "Unable to start openssl!" << endl; kdError() << "Unable to start openssl!" << endl;
@ -1350,7 +1350,7 @@ bool Utils::getNeedsPassphrase(TQString key)
usleep ( 500 ); usleep ( 500 );
config->appPointer->processEvents(); config->appPointer->processEvents();
} }
disconnect( NeedsPassphraseProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readOutNeedsPassphrase() ) ); disconnect( NeedsPassphraseProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readOutNeedsPassphrase() ) );
delete NetworkDeviceTestProcess; delete NetworkDeviceTestProcess;
NeedsPassphraseProcess=0L; NeedsPassphraseProcess=0L;
} }
@ -1365,11 +1365,11 @@ TQString Utils::getHostname()
GetHostnameProcess = new TQProcess( this ); GetHostnameProcess = new TQProcess( this );
GetHostnameProcess->addArgument( "hostname" ); GetHostnameProcess->addArgument( "hostname" );
connect( GetHostnameProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutGetHostname() ) ); connect( GetHostnameProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutGetHostname() ) );
connect( GetHostnameProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrGetHostname() ) ); connect( GetHostnameProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrGetHostname() ) );
if ( !GetHostnameProcess->start( env ) ) { if ( !GetHostnameProcess->start( env ) ) {
disconnect( GetHostnameProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutGetHostname() ) ); disconnect( GetHostnameProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutGetHostname() ) );
disconnect( GetHostnameProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrGetHostname() ) ); disconnect( GetHostnameProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrGetHostname() ) );
delete GetHostnameProcess; delete GetHostnameProcess;
GetHostnameProcess=0L; GetHostnameProcess=0L;
kdError() << "Unable to start getHostname process!" << endl; kdError() << "Unable to start getHostname process!" << endl;
@ -1381,8 +1381,8 @@ TQString Utils::getHostname()
{ {
usleep(200); usleep(200);
} }
disconnect( GetHostnameProcess, TQT_SIGNAL( readyReadStdout() ), this, TQT_SLOT( readStdOutGetHostname() ) ); disconnect( GetHostnameProcess, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( readStdOutGetHostname() ) );
disconnect( GetHostnameProcess, TQT_SIGNAL( readyReadStderr() ), this, TQT_SLOT( readStdErrGetHostname() ) ); disconnect( GetHostnameProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readStdErrGetHostname() ) );
delete GetHostnameProcess; delete GetHostnameProcess;
GetHostnameProcess=0L; GetHostnameProcess=0L;
return Hostname; return Hostname;

16
src/widgetnotifyhelper.cpp
Unescape View File

@ -43,51 +43,51 @@ void WidgetNotifyHelper::setupChangedAction(TQWidget *w)
for ( obj = list->first(); obj; obj = list->next() ) for ( obj = list->first(); obj; obj = list->next() )
{ {
// std::cout << "obj found: " << obj->name() << std::endl; // std::cout << "obj found: " << obj->name() << std::endl;
connect(obj,TQT_SIGNAL(textChanged ( const TQString & )),w,TQT_SIGNAL(changed())); connect(obj,TQ_SIGNAL(textChanged ( const TQString & )),w,TQ_SIGNAL(changed()));
} }
list = w->queryList( "KLineEdit" ); list = w->queryList( "KLineEdit" );
for ( obj = list->first(); obj; obj = list->next() ) for ( obj = list->first(); obj; obj = list->next() )
{ {
// std::cout << "obj found: " << obj->name() << std::endl; // std::cout << "obj found: " << obj->name() << std::endl;
connect(obj,TQT_SIGNAL(textChanged ( const TQString & )),w,TQT_SIGNAL(changed())); connect(obj,TQ_SIGNAL(textChanged ( const TQString & )),w,TQ_SIGNAL(changed()));
} }
list = w->queryList( "TQLineEdit" ); list = w->queryList( "TQLineEdit" );
for ( obj = list->first(); obj; obj = list->next() ) for ( obj = list->first(); obj; obj = list->next() )
{ {
// std::cout << "obj found: " << obj->name() << std::endl; // std::cout << "obj found: " << obj->name() << std::endl;
connect(obj,TQT_SIGNAL(textChanged (const TQString & )),w,TQT_SIGNAL(changed())); connect(obj,TQ_SIGNAL(textChanged (const TQString & )),w,TQ_SIGNAL(changed()));
} }
list = w->queryList( "KUrlRquester" ); list = w->queryList( "KUrlRquester" );
for ( obj = list->first(); obj; obj = list->next() ) for ( obj = list->first(); obj; obj = list->next() )
{ {
// std::cout << "obj found: " << obj->name() << std::endl; // std::cout << "obj found: " << obj->name() << std::endl;
connect(obj,TQT_SIGNAL(textChanged ( const TQString & )),w,TQT_SIGNAL(changed())); connect(obj,TQ_SIGNAL(textChanged ( const TQString & )),w,TQ_SIGNAL(changed()));
} }
list = w->queryList( "TQSpinBox" ); list = w->queryList( "TQSpinBox" );
for ( obj = list->first(); obj; obj = list->next() ) for ( obj = list->first(); obj; obj = list->next() )
{ {
// std::cout << "obj found: " << obj->name() << std::endl; // std::cout << "obj found: " << obj->name() << std::endl;
connect(obj,TQT_SIGNAL(valueChanged ( int )),w,TQT_SIGNAL(changed())); connect(obj,TQ_SIGNAL(valueChanged ( int )),w,TQ_SIGNAL(changed()));
} }
list = w->queryList( "TQCheckBox" ); list = w->queryList( "TQCheckBox" );
for ( obj = list->first(); obj; obj = list->next() ) for ( obj = list->first(); obj; obj = list->next() )
{ {
// std::cout << "obj found: " << obj->name() << std::endl; // std::cout << "obj found: " << obj->name() << std::endl;
connect(obj,TQT_SIGNAL(stateChanged ( int )),w,TQT_SIGNAL(changed())); connect(obj,TQ_SIGNAL(stateChanged ( int )),w,TQ_SIGNAL(changed()));
} }
list = w->queryList( "TQRadioButton" ); list = w->queryList( "TQRadioButton" );
for ( obj = list->first(); obj; obj = list->next() ) for ( obj = list->first(); obj; obj = list->next() )
{ {
// std::cout << "obj found: " << obj->name() << std::endl; // std::cout << "obj found: " << obj->name() << std::endl;
connect(obj,TQT_SIGNAL(stateChanged ( int )),w,TQT_SIGNAL(changed())); connect(obj,TQ_SIGNAL(stateChanged ( int )),w,TQ_SIGNAL(changed()));
} }
// connect changed to slot // connect changed to slot
connect(w,TQT_SIGNAL(changed ()),w,TQT_SLOT(dialogChanged())); connect(w,TQ_SIGNAL(changed ()),w,TQ_SLOT(dialogChanged()));
} }

Write Preview
Loading…
Cancel
Save