summaryrefslogtreecommitdiffstats
path: root/src/preferencesdialog.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/preferencesdialog.cpp')
-rw-r--r--src/preferencesdialog.cpp870
1 files changed, 435 insertions, 435 deletions
diff --git a/src/preferencesdialog.cpp b/src/preferencesdialog.cpp
index 4c80e95..4ea5460 100644
--- a/src/preferencesdialog.cpp
+++ b/src/preferencesdialog.cpp
@@ -22,21 +22,21 @@
***************************************************************************/
//BEGIN INCLUDES
#include "preferencesdialog.h"
-#include <qtabwidget.h>
-#include <qpushbutton.h>
+#include <tqtabwidget.h>
+#include <tqpushbutton.h>
#include <klocale.h>
-#include <qcheckbox.h>
-#include <qwhatsthis.h>
+#include <tqcheckbox.h>
+#include <tqwhatsthis.h>
#include <kmessagebox.h>
-#include <qspinbox.h>
-#include <qpixmap.h>
+#include <tqspinbox.h>
+#include <tqpixmap.h>
#include <kurlrequester.h>
#include <kcolordialog.h>
#include <kcombobox.h>
-#include <qlabel.h>
-#include <qstringlist.h>
-#include <qcursor.h>
-#include <qobjectlist.h>
+#include <tqlabel.h>
+#include <tqstringlist.h>
+#include <tqcursor.h>
+#include <tqobjectlist.h>
#include <kiconloader.h>
#include <klineedit.h>
#include <kinputdialog.h>
@@ -44,11 +44,11 @@
#include <klistview.h>
#include <ktextedit.h>
#include <kpassdlg.h>
-#include <qlayout.h>
-#include <qhbox.h>
-#include <qcursor.h>
-#include <qradiobutton.h>
-#include <qbuttongroup.h>
+#include <tqlayout.h>
+#include <tqhbox.h>
+#include <tqcursor.h>
+#include <tqradiobutton.h>
+#include <tqbuttongroup.h>
#include "networkinterface.h"
#include "utils.h"
#include "importcertificatedialog.h"
@@ -57,16 +57,16 @@
#include <iostream>
//END INCLUDES
-PreferencesDialog::PreferencesDialog( QWidget *parent, QApplication *app, QTextEdit *LogOutput, KVpncConfig *GlobalConfig, bool showOnlyProfiles ) : KDialogBase ( KDialogBase::TreeList, i18n( "Preferences..." ),
+PreferencesDialog::PreferencesDialog( TQWidget *parent, TQApplication *app, TQTextEdit *LogOutput, KVpncConfig *GlobalConfig, bool showOnlyProfiles ) : KDialogBase ( KDialogBase::TreeList, i18n( "Preferences..." ),
KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel | KDialogBase::Help, KDialogBase::Ok,
parent, "configdialog" )
{
- GlobalConfig->appPointer->setOverrideCursor( QCursor(Qt::WaitCursor) );
+ GlobalConfig->appPointer->setOverrideCursor( TQCursor(TQt::WaitCursor) );
GlobalConfig->prefDlgOpen = true;
//main = new PreferencesDialogBase(this);
//setMainWidget(main);
- //main->setMinimumSize(main->sizeHint())
+ //main->setMinimumSize(main->tqsizeHint())
this->AccountList = GlobalConfig->AccountList;
this->LogOutput = LogOutput;
@@ -221,21 +221,21 @@ PreferencesDialog::PreferencesDialog( QWidget *parent, QApplication *app, QTextE
ConfigDaemonOptionsWidget->SshPathInput->setURL( GlobalConfig->pathToSsh );
- if ( VpncInfo->found && QFileInfo( VpncInfo->PathToExec ).isFile() && VpncInfo->found )
+ if ( VpncInfo->found && TQFileInfo( VpncInfo->PathToExec ).isFile() && VpncInfo->found )
ConfigDaemonOptionsWidget->VpncStatePixmapLabel->setPixmap( ok_icon );
else
ConfigDaemonOptionsWidget->CiscoVpncStatePixmapLabel->setPixmap( wrong_icon );
- if ( VpncInfo->found && QFileInfo( CiscoVpncInfo->PathToExec ).isFile() && CiscoVpncInfo->found )
+ if ( VpncInfo->found && TQFileInfo( CiscoVpncInfo->PathToExec ).isFile() && CiscoVpncInfo->found )
ConfigDaemonOptionsWidget->CiscoVpncStatePixmapLabel->setPixmap( ok_icon );
else
ConfigDaemonOptionsWidget->CiscoVpncStatePixmapLabel->setPixmap( wrong_icon );
- if ( VtunInfo->found && QFileInfo( VtunInfo->PathToExec ).isFile() && VtunInfo->found )
+ if ( VtunInfo->found && TQFileInfo( VtunInfo->PathToExec ).isFile() && VtunInfo->found )
ConfigDaemonOptionsWidget->VtundStatePixmapLabel->setPixmap( ok_icon );
else
ConfigDaemonOptionsWidget->VtundStatePixmapLabel->setPixmap( wrong_icon );
- if ( SshInfo->found && QFileInfo( SshInfo->PathToExec ).isFile() && SshInfo->found )
+ if ( SshInfo->found && TQFileInfo( SshInfo->PathToExec ).isFile() && SshInfo->found )
ConfigDaemonOptionsWidget->SshStatePixmapLabel->setPixmap( ok_icon );
else
ConfigDaemonOptionsWidget->SshStatePixmapLabel->setPixmap( wrong_icon );
@@ -419,7 +419,7 @@ PreferencesDialog::PreferencesDialog( QWidget *parent, QApplication *app, QTextE
ConfigDaemonOptionsWidget->PppdKernelLogLevelComboBox->setCurrentText(i18n("general + packets"));
ConfigDaemonOptionsWidget->DebugL2tpdCheckBox->setChecked( GlobalConfig->enableDebugL2tpd );
- for ( QStringList::Iterator it = GlobalConfig->PlutoDebug.begin(); it != GlobalConfig->PlutoDebug.end(); ++it )
+ for ( TQStringList::Iterator it = GlobalConfig->PlutoDebug.begin(); it != GlobalConfig->PlutoDebug.end(); ++it )
{
if (*it == "raw")
ConfigDaemonOptionsWidget->IpsecRawDebugCheckBox->setChecked(true);
@@ -438,7 +438,7 @@ PreferencesDialog::PreferencesDialog( QWidget *parent, QApplication *app, QTextE
}
- for ( QStringList::Iterator it = GlobalConfig->KlipsDebug.begin(); it != GlobalConfig->KlipsDebug.end(); ++it )
+ for ( TQStringList::Iterator it = GlobalConfig->KlipsDebug.begin(); it != GlobalConfig->KlipsDebug.end(); ++it )
{
if (*it == "tunnel-xmit")
ConfigDaemonOptionsWidget->KlipsDebugTunnel_xmitCheckBox->setChecked(true);
@@ -481,24 +481,24 @@ PreferencesDialog::PreferencesDialog( QWidget *parent, QApplication *app, QTextE
LogOptionsWidget->LogFontSizeSpinBox->setValue( GlobalConfig->LogViewerFontSize );
/* keep english names! */
- ConfigDaemonOptionsWidget->KlipsDebugTunnel_xmitCheckBox->setText( QString( "&tunnel-xmit" ) );
- ConfigDaemonOptionsWidget->KlipsDebugPfkeyCheckBox->setText( QString( "pfkey" ) );
- ConfigDaemonOptionsWidget->KlipsDebugXformCheckBox->setText( QString( "xform" ) );
- ConfigDaemonOptionsWidget->KlipsDebugErouteCheckBox->setText( QString( "eroute" ) );
- ConfigDaemonOptionsWidget->KlipsDebugSpiCheckBox->setText( QString( "spi" ) );
- ConfigDaemonOptionsWidget->KlipsDebugRadijCheckBox->setText( QString( "radij" ) );
- ConfigDaemonOptionsWidget->KlipsDebugEspCheckBox->setText( QString( "esp" ) );
- ConfigDaemonOptionsWidget->KlipsDebugAhCheckBox->setText( QString( "ah" ) );
- ConfigDaemonOptionsWidget->KlipsDebugIpcompCheckBox->setText( QString( "ipcomp" ) );
- ConfigDaemonOptionsWidget->KlipsDebugVerboseCheckBox->setText( QString( "verbose" ) );
+ ConfigDaemonOptionsWidget->KlipsDebugTunnel_xmitCheckBox->setText( TQString( "&tunnel-xmit" ) );
+ ConfigDaemonOptionsWidget->KlipsDebugPfkeyCheckBox->setText( TQString( "pfkey" ) );
+ ConfigDaemonOptionsWidget->KlipsDebugXformCheckBox->setText( TQString( "xform" ) );
+ ConfigDaemonOptionsWidget->KlipsDebugErouteCheckBox->setText( TQString( "eroute" ) );
+ ConfigDaemonOptionsWidget->KlipsDebugSpiCheckBox->setText( TQString( "spi" ) );
+ ConfigDaemonOptionsWidget->KlipsDebugRadijCheckBox->setText( TQString( "radij" ) );
+ ConfigDaemonOptionsWidget->KlipsDebugEspCheckBox->setText( TQString( "esp" ) );
+ ConfigDaemonOptionsWidget->KlipsDebugAhCheckBox->setText( TQString( "ah" ) );
+ ConfigDaemonOptionsWidget->KlipsDebugIpcompCheckBox->setText( TQString( "ipcomp" ) );
+ ConfigDaemonOptionsWidget->KlipsDebugVerboseCheckBox->setText( TQString( "verbose" ) );
- ConfigDaemonOptionsWidget->IpsecEmittingDebugCheckBox->setText( QString( "emitting" ) );
- ConfigDaemonOptionsWidget->IpsecCryptDebugCheckBox->setText( QString( "cr&ypt" ) );
- ConfigDaemonOptionsWidget->IpsecRawDebugCheckBox->setText( QString( "&raw" ) );
- ConfigDaemonOptionsWidget->IpsecKlipsDebugCheckBox->setText( QString( "&klips" ) );
- ConfigDaemonOptionsWidget->IpsecParsingDebugCheckBox->setText( QString( "&parsing" ) );
- ConfigDaemonOptionsWidget->IpsecPrivateDebugCheckBox->setText( QString( "&private" ) );
- ConfigDaemonOptionsWidget->IpsecControlDebugCheckBox->setText( QString( "&control" ) );
+ ConfigDaemonOptionsWidget->IpsecEmittingDebugCheckBox->setText( TQString( "emitting" ) );
+ ConfigDaemonOptionsWidget->IpsecCryptDebugCheckBox->setText( TQString( "cr&ypt" ) );
+ ConfigDaemonOptionsWidget->IpsecRawDebugCheckBox->setText( TQString( "&raw" ) );
+ ConfigDaemonOptionsWidget->IpsecKlipsDebugCheckBox->setText( TQString( "&klips" ) );
+ ConfigDaemonOptionsWidget->IpsecParsingDebugCheckBox->setText( TQString( "&parsing" ) );
+ ConfigDaemonOptionsWidget->IpsecPrivateDebugCheckBox->setText( TQString( "&private" ) );
+ ConfigDaemonOptionsWidget->IpsecControlDebugCheckBox->setText( TQString( "&control" ) );
bool profileInList = false;
for ( uint i = 0; i < GlobalConfig->AccountList->count();i++ )
@@ -527,12 +527,12 @@ PreferencesDialog::PreferencesDialog( QWidget *parent, QApplication *app, QTextE
// TODO read types from list
ProfileGeneralOptionsWidget->ConnectionTypeComboBox->insertItem( i18n( "Cisco (vpnc)" ), VpnAccountData::cisco );
- ProfileGeneralOptionsWidget->ConnectionTypeComboBox->insertItem( i18n( "IPSec (%1)" ).arg("racoon"), VpnAccountData::racoon );
- ProfileGeneralOptionsWidget->ConnectionTypeComboBox->insertItem( i18n( "IPSec (%1)" ).arg("Openswan/strongSwan"), VpnAccountData::freeswan );
+ ProfileGeneralOptionsWidget->ConnectionTypeComboBox->insertItem( i18n( "IPSec (%1)" ).tqarg("racoon"), VpnAccountData::racoon );
+ ProfileGeneralOptionsWidget->ConnectionTypeComboBox->insertItem( i18n( "IPSec (%1)" ).tqarg("Openswan/strongSwan"), VpnAccountData::freeswan );
ProfileGeneralOptionsWidget->ConnectionTypeComboBox->insertItem( i18n( "PPTP" ), VpnAccountData::pptp );
ProfileGeneralOptionsWidget->ConnectionTypeComboBox->insertItem( i18n( "OpenVPN" ), VpnAccountData::openvpn );
- ProfileGeneralOptionsWidget->ConnectionTypeComboBox->insertItem( i18n( "L2TP (%1)" ).arg("racoon"), VpnAccountData::l2tpd_racoon );
- ProfileGeneralOptionsWidget->ConnectionTypeComboBox->insertItem( i18n( "L2TP (%1)" ).arg("Openswan/strongSwan"), VpnAccountData::l2tpd_freeswan );
+ ProfileGeneralOptionsWidget->ConnectionTypeComboBox->insertItem( i18n( "L2TP (%1)" ).tqarg("racoon"), VpnAccountData::l2tpd_racoon );
+ ProfileGeneralOptionsWidget->ConnectionTypeComboBox->insertItem( i18n( "L2TP (%1)" ).tqarg("Openswan/strongSwan"), VpnAccountData::l2tpd_freeswan );
ProfileGeneralOptionsWidget->ConnectionTypeComboBox->insertItem( i18n( "Cisco (proprietary)" ), VpnAccountData::ciscoorig );
ProfileGeneralOptionsWidget->ConnectionTypeComboBox->insertItem( i18n( "Vtun" ), VpnAccountData::vtun );
ProfileGeneralOptionsWidget->ConnectionTypeComboBox->insertItem( i18n( "SSH" ), VpnAccountData::ssh );
@@ -565,8 +565,8 @@ PreferencesDialog::PreferencesDialog( QWidget *parent, QApplication *app, QTextE
/*
none: No ID
address: The type is the IP address. This is the default type if you do not specify an identifier to use
- user_fqdn: The type is a USER_FQDN (user fully-qualified domain name)
- fqdn: The type is a FQDN (fully-qualified domain name)
+ user_fqdn: The type is a USER_FTQDN (user fully-qualified domain name)
+ fqdn: The type is a FTQDN (fully-qualified domain name)
keyid: The type is a KEY_ID, read from the file
keyid: The type is a KEY_ID, specified in the quoted string
asn1dn: The type is an ASN.1 distinguished name. If empty, DN from the Subject field in the certificate will be used
@@ -627,13 +627,13 @@ PreferencesDialog::PreferencesDialog( QWidget *parent, QApplication *app, QTextE
// // phase 2 encr algos from kernel
-// for ( QStringList::Iterator it = KernelCrypto.IpsecEspEncryptionAlgorithms.begin(); it != KernelCrypto.IpsecEspEncryptionAlgorithms.end(); ++it )
+// for ( TQStringList::Iterator it = KernelCrypto.IpsecEspEncryptionAlgorithms.begin(); it != KernelCrypto.IpsecEspEncryptionAlgorithms.end(); ++it )
// {
// ProfileRacoonOptionsWidget->EncryptionAlgorithm2ComboBox->insertItem ( *it );
// }
//
// // phase 2 auth algos from kernel
-// for ( QStringList::Iterator it = KernelCrypto.IpsecEspAuthenticationAlgorithms.begin(); it != KernelCrypto.IpsecEspAuthenticationAlgorithms.end(); ++it )
+// for ( TQStringList::Iterator it = KernelCrypto.IpsecEspAuthenticationAlgorithms.begin(); it != KernelCrypto.IpsecEspAuthenticationAlgorithms.end(); ++it )
// {
// ProfileRacoonOptionsWidget->AuthenticationAlgorithm2ComboBox->insertItem ( *it );
// }
@@ -670,15 +670,15 @@ PreferencesDialog::PreferencesDialog( QWidget *parent, QApplication *app, QTextE
slotStatusMsg ( i18n( "Collecting OpenVPN capabilities..."), ID_FLASH_MSG );
- QStringList ciphers = Utils( GlobalConfig ).getOpenvpnCiphers();
- QStringList digests = Utils( GlobalConfig ).getOpenvpnDigests();
+ TQStringList ciphers = Utils( GlobalConfig ).getOpenvpnCiphers();
+ TQStringList digests = Utils( GlobalConfig ).getOpenvpnDigests();
- for ( QStringList::Iterator it = ciphers.begin(); it != ciphers.end(); ++it )
+ for ( TQStringList::Iterator it = ciphers.begin(); it != ciphers.end(); ++it )
{
ProfileOpenvpnOptionsWidget->UserdefiniedCipherComboBox->insertItem( *it );
}
- for ( QStringList::Iterator it = digests.begin(); it != digests.end(); ++it )
+ for ( TQStringList::Iterator it = digests.begin(); it != digests.end(); ++it )
{
ProfileOpenvpnOptionsWidget->UserdefiniedDigestComboBox->insertItem( *it );
}
@@ -696,7 +696,7 @@ PreferencesDialog::PreferencesDialog( QWidget *parent, QApplication *app, QTextE
ProfileCiscoOptionsWidget->CiscoNatModeComboBox->insertItem("force-natt");
ProfileCiscoOptionsWidget->CiscoNatModeComboBox->insertItem("cisco-udp");
ProfileCiscoOptionsWidget->CiscoNatModeComboBox->insertItem("none");
- connect (ProfileCiscoOptionsWidget->CiscoNatModeComboBox, SIGNAL(textChanged ( const QString &)), this, SLOT(natModeToggled( const QString &)));
+ connect (ProfileCiscoOptionsWidget->CiscoNatModeComboBox, TQT_SIGNAL(textChanged ( const TQString &)), this, TQT_SLOT(natModeToggled( const TQString &)));
profileAddedOrDeleted = false;
@@ -904,7 +904,7 @@ PreferencesDialog::PreferencesDialog( QWidget *parent, QApplication *app, QTextE
NetworkInterface iface( GlobalConfig, GlobalConfig->appPointer );
- QStringList list = iface.getAllNetworkInterfaces();
+ TQStringList list = iface.getAllNetworkInterfaces();
ProfileNetworkGeneralOptionsWidget->NetworkDeviceComboBox->insertItem( "default" );
// // pppd settings
@@ -919,9 +919,9 @@ PreferencesDialog::PreferencesDialog( QWidget *parent, QApplication *app, QTextE
// ProfileNetworkVirtualIpOptionsWidget->LabelRemoteVirtualIp->setEnabled( true );
// ProfileNetworkVirtualIpOptionsWidget->LabelLocalVirtualIp->setEnabled( true );
- for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it )
+ for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it )
{
- ProfileNetworkGeneralOptionsWidget->NetworkDeviceComboBox->insertItem( QString( *it ) );
+ ProfileNetworkGeneralOptionsWidget->NetworkDeviceComboBox->insertItem( TQString( *it ) );
}
ProfileNetworkGeneralOptionsWidget->NetworkDeviceComboBox->setEnabled( true );
ProfileNetworkGeneralOptionsWidget->LabelNetworkDevice->setEnabled( true );
@@ -942,14 +942,14 @@ void PreferencesDialog::setupGui()
setShowIconsInTreeList( true );
- QStringList path;
+ TQStringList path;
path.clear();
path << i18n( "KVpnc" );
setFolderIcon ( path, SmallIcon( "application", KIcon::SizeSmall ) );
path.clear();
- QVBoxLayout *lo;
+ TQVBoxLayout *lo;
if ( !showOnlyProfiles )
{
@@ -958,25 +958,25 @@ void PreferencesDialog::setupGui()
// General page
path << i18n( "Application" ) << i18n( "General" );
GeneralFrame = addPage( path, i18n( "General" ), BarIcon( "kvpnc", KIcon::SizeSmall ) );
- lo = new QVBoxLayout( GeneralFrame, 0, KDialog::spacingHint() );
+ lo = new TQVBoxLayout( GeneralFrame, 0, KDialog::spacingHint() );
GeneralOptionsWidget = new ConfigGeneralOptions( GeneralFrame );
lo->addWidget( GeneralOptionsWidget );
- connect(GeneralOptionsWidget->useKwalletCheckBox, SIGNAL(toggled(bool)),this, SLOT(useKwalletToggled(bool)));
+ connect(GeneralOptionsWidget->useKwalletCheckBox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(useKwalletToggled(bool)));
- // const QObjectList *GeneralOptionsWidgetList = GeneralOptionsWidget->queryList( "QCheckBox" );
- // QObjectListIt it( *GeneralOptionsWidgetList );
+ // const TQObjectList *GeneralOptionsWidgetList = GeneralOptionsWidget->queryList( TQCHECKBOX_OBJECT_NAME_STRING );
+ // TQObjectListIt it( *GeneralOptionsWidgetList );
//
- // for ( QObject *child = it.current(); it; ++it)
+ // for ( TQObject *child = it.current(); it; ++it)
// {
// // std::cout << "name: " << child->name() << std::endl;
- // connect(child, SIGNAL(stateChanged(int)), this, SLOT(checkboxStateChanged(int)));
+ // connect(child, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(checkboxStateChanged(int)));
// }
// Debug
path.clear();
path << i18n( "Application" ) << i18n( "Debug" );
DebugFrame = addPage( path, i18n( "Debug" ), BarIcon( "bug", KIcon::SizeSmall ) );
- lo = new QVBoxLayout( DebugFrame );
+ lo = new TQVBoxLayout( DebugFrame );
lo->setSpacing( KDialog::spacingHint() );
DebugOptionsWidget = new ConfigDebugOptions( DebugFrame, "Debug" );
lo->addWidget( DebugOptionsWidget );
@@ -984,7 +984,7 @@ void PreferencesDialog::setupGui()
path.clear();
path << i18n( "Application" ) << i18n( "Connect" );
ConfigConnectOptionsFrame = addPage( path, i18n( "Connect" ), BarIcon( "connecting", KIcon::SizeSmall ) );
- lo = new QVBoxLayout( ConfigConnectOptionsFrame );
+ lo = new TQVBoxLayout( ConfigConnectOptionsFrame );
lo->setSpacing( KDialog::spacingHint() );
ConnectOptionsWidget = new ConfigConnectOptions( ConfigConnectOptionsFrame );
lo->addWidget( ConnectOptionsWidget );
@@ -992,7 +992,7 @@ void PreferencesDialog::setupGui()
path.clear();
path << i18n( "Application" ) << i18n( "Log" );
LogFrame = addPage( path, i18n( "Log" ), BarIcon( "text_center", KIcon::SizeSmall ) );
- lo = new QVBoxLayout( LogFrame );
+ lo = new TQVBoxLayout( LogFrame );
lo->setSpacing( KDialog::spacingHint() );
LogOptionsWidget = new ConfigLogOptions( LogFrame );
lo->addWidget( LogOptionsWidget );
@@ -1003,10 +1003,10 @@ void PreferencesDialog::setupGui()
path.clear();
path << i18n( "Programs" ) << i18n( "Daemons" );
DaemonOptionsFrame = addVBoxPage( path, i18n( "Daemons" ), BarIcon( "fork", KIcon::SizeSmall ) );
-// DaemonOptionsFrame->resize(DaemonOptionsFrame->sizeHint());
-// lo = new QVBoxLayout( DaemonOptionsFrame );
- DaemonScrollView = new QScrollView(DaemonOptionsFrame, "daemonscrollview");
- lo = new QVBoxLayout( DaemonScrollView );
+// DaemonOptionsFrame->resize(DaemonOptionsFrame->tqsizeHint());
+// lo = new TQVBoxLayout( DaemonOptionsFrame );
+ DaemonScrollView = new TQScrollView(DaemonOptionsFrame, "daemonscrollview");
+ lo = new TQVBoxLayout( DaemonScrollView );
lo->setSpacing( KDialog::spacingHint() );
lo->addWidget(DaemonScrollView);
ConfigDaemonOptionsWidget = new ConfigDaemonOptions( DaemonScrollView->viewport() );
@@ -1016,29 +1016,29 @@ void PreferencesDialog::setupGui()
// DaemonScrollView->adjustSize();
- QSize deamonsize = ConfigDaemonOptionsWidget->sizeHint();
- ConfigDaemonOptionsWidget->resize(QSize(deamonsize.width()-4,deamonsize.height()));
- ConfigDaemonOptionsWidget->setFixedSize(QSize(deamonsize.width()-4,deamonsize.height()));
-// DaemonScrollView->resize(sv->sizeHint());
+ TQSize deamonsize = ConfigDaemonOptionsWidget->tqsizeHint();
+ ConfigDaemonOptionsWidget->resize(TQSize(deamonsize.width()-4,deamonsize.height()));
+ ConfigDaemonOptionsWidget->setFixedSize(TQSize(deamonsize.width()-4,deamonsize.height()));
+// DaemonScrollView->resize(sv->tqsizeHint());
// lo->addWidget( DaemonScrollView );
// DaemonFrame->adjustSize();
- connect(ConfigDaemonOptionsWidget->OpenvpnPathInput, SIGNAL( urlSelected( const QString& ) ), this, SLOT( OpenvpnPathChanged( const QString& ) ) );
- connect(ConfigDaemonOptionsWidget->FreeswanPathInput, SIGNAL( urlSelected( const QString& ) ), this, SLOT( FreeswanPathChanged( const QString& ) ) );
- connect(ConfigDaemonOptionsWidget->PppdPathInput, SIGNAL( urlSelected( const QString& ) ), this, SLOT( PppdPathChanged( const QString& ) ) );
- connect(ConfigDaemonOptionsWidget->PptpPathInput, SIGNAL( urlSelected( const QString& ) ), this, SLOT( PptpPathChanged( const QString& ) ) );
- connect(ConfigDaemonOptionsWidget->RacoonPathInput, SIGNAL( urlSelected( const QString& ) ), this, SLOT( RacoonPathChanged( const QString& ) ) );
- connect(ConfigDaemonOptionsWidget->VpncPathInput, SIGNAL( urlSelected( const QString& ) ), this, SLOT( VpncPathChanged( const QString& ) ) );
- connect(ConfigDaemonOptionsWidget->L2tpdPathInput, SIGNAL( urlSelected( const QString& ) ), this, SLOT( L2tpdPathChanged( const QString& ) ) );
- connect(ConfigDaemonOptionsWidget->Xl2tpdPathInput, SIGNAL( urlSelected( const QString& ) ), this, SLOT( Xl2tpdPathChanged( const QString& ) ) );
- connect(ConfigDaemonOptionsWidget->VtundPathInput, SIGNAL( urlSelected( const QString& ) ), this, SLOT( VtundPathChanged( const QString& ) ) );
- connect(ConfigDaemonOptionsWidget->SshPathInput, SIGNAL( urlSelected( const QString& ) ), this, SLOT( SshPathChanged( const QString& ) ) );
+ connect(ConfigDaemonOptionsWidget->OpenvpnPathInput, TQT_SIGNAL( urlSelected( const TQString& ) ), this, TQT_SLOT( OpenvpnPathChanged( const TQString& ) ) );
+ connect(ConfigDaemonOptionsWidget->FreeswanPathInput, TQT_SIGNAL( urlSelected( const TQString& ) ), this, TQT_SLOT( FreeswanPathChanged( const TQString& ) ) );
+ connect(ConfigDaemonOptionsWidget->PppdPathInput, TQT_SIGNAL( urlSelected( const TQString& ) ), this, TQT_SLOT( PppdPathChanged( const TQString& ) ) );
+ connect(ConfigDaemonOptionsWidget->PptpPathInput, TQT_SIGNAL( urlSelected( const TQString& ) ), this, TQT_SLOT( PptpPathChanged( const TQString& ) ) );
+ connect(ConfigDaemonOptionsWidget->RacoonPathInput, TQT_SIGNAL( urlSelected( const TQString& ) ), this, TQT_SLOT( RacoonPathChanged( const TQString& ) ) );
+ connect(ConfigDaemonOptionsWidget->VpncPathInput, TQT_SIGNAL( urlSelected( const TQString& ) ), this, TQT_SLOT( VpncPathChanged( const TQString& ) ) );
+ connect(ConfigDaemonOptionsWidget->L2tpdPathInput, TQT_SIGNAL( urlSelected( const TQString& ) ), this, TQT_SLOT( L2tpdPathChanged( const TQString& ) ) );
+ connect(ConfigDaemonOptionsWidget->Xl2tpdPathInput, TQT_SIGNAL( urlSelected( const TQString& ) ), this, TQT_SLOT( Xl2tpdPathChanged( const TQString& ) ) );
+ connect(ConfigDaemonOptionsWidget->VtundPathInput, TQT_SIGNAL( urlSelected( const TQString& ) ), this, TQT_SLOT( VtundPathChanged( const TQString& ) ) );
+ connect(ConfigDaemonOptionsWidget->SshPathInput, TQT_SIGNAL( urlSelected( const TQString& ) ), this, TQT_SLOT( SshPathChanged( const TQString& ) ) );
path.clear();
path << i18n( "Programs" ) << i18n( "Helper Programs" );
HelperProgramFrame = addPage( path, i18n( "Helper Programs" ), BarIcon( "tool", KIcon::SizeSmall ) );
- lo = new QVBoxLayout( HelperProgramFrame );
+ lo = new TQVBoxLayout( HelperProgramFrame );
lo->setSpacing( KDialog::spacingHint() );
HelperProgramOptionsWidget = new ConfigHelperProgramOptions( HelperProgramFrame );
@@ -1055,14 +1055,14 @@ void PreferencesDialog::setupGui()
path.clear();
path << i18n( "Profile" ) << i18n( "General" );
ProfileGeneralOptionsFrame = addPage( path, i18n( "General" ), BarIcon( "application", KIcon::SizeSmall ) );
- lo = new QVBoxLayout( ProfileGeneralOptionsFrame );
+ lo = new TQVBoxLayout( ProfileGeneralOptionsFrame );
lo->setSpacing( KDialog::spacingHint() );
- QWidget *ProfileGeneralSelectorWidget = new QWidget( ProfileGeneralOptionsFrame );
- QHBoxLayout *ProfileGeneralSelectorLayout = new QHBoxLayout( ProfileGeneralSelectorWidget );
- QLabel *ProfileGeneralSelectorLabel = new QLabel( ProfileGeneralSelectorWidget );
+ TQWidget *ProfileGeneralSelectorWidget = new TQWidget( ProfileGeneralOptionsFrame );
+ TQHBoxLayout *ProfileGeneralSelectorLayout = new TQHBoxLayout( ProfileGeneralSelectorWidget );
+ TQLabel *ProfileGeneralSelectorLabel = new TQLabel( ProfileGeneralSelectorWidget );
ProfileGeneralSelectorLabel->setText( i18n( "Profile:" ) );
- ProfileGeneralSelector = new QComboBox( ProfileGeneralSelectorWidget );
+ ProfileGeneralSelector = new TQComboBox( ProfileGeneralSelectorWidget );
ProfileGeneralSelectorLayout->addWidget( ProfileGeneralSelectorLabel );
ProfileGeneralSelectorLayout->addWidget( ProfileGeneralSelector );
@@ -1075,14 +1075,14 @@ void PreferencesDialog::setupGui()
path.clear();
path << i18n( "Profile" ) << i18n( "Authenticate" ) << i18n( "User data" );
ProfileUserOptionsFrame = addPage( path, i18n( "User Data" ), BarIcon( "user", KIcon::SizeSmall ) );
- lo = new QVBoxLayout( ProfileUserOptionsFrame );
+ lo = new TQVBoxLayout( ProfileUserOptionsFrame );
lo->setSpacing( KDialog::spacingHint() );
- QWidget *ProfileUserSelectorWidget = new QWidget( ProfileUserOptionsFrame );
- QHBoxLayout *ProfileUserSelectorLayout = new QHBoxLayout( ProfileUserSelectorWidget );
- QLabel *ProfileUserSelectorLabel = new QLabel( ProfileUserSelectorWidget );
+ TQWidget *ProfileUserSelectorWidget = new TQWidget( ProfileUserOptionsFrame );
+ TQHBoxLayout *ProfileUserSelectorLayout = new TQHBoxLayout( ProfileUserSelectorWidget );
+ TQLabel *ProfileUserSelectorLabel = new TQLabel( ProfileUserSelectorWidget );
ProfileUserSelectorLabel->setText( i18n( "Profile:" ) );
- ProfileUserSelector = new QComboBox( ProfileUserSelectorWidget );
+ ProfileUserSelector = new TQComboBox( ProfileUserSelectorWidget );
ProfileUserSelectorLayout->addWidget( ProfileUserSelectorLabel );
ProfileUserSelectorLayout->addWidget( ProfileUserSelector );
@@ -1091,18 +1091,18 @@ void PreferencesDialog::setupGui()
lo->addWidget( ProfileUserSelectorWidget );
lo->addWidget( ProfileUserOptionsWidget );
ProfileUserSelector->setEnabled( true );
- connect(ProfileUserOptionsWidget->NtDomainNameCheckbox, SIGNAL(toggled(bool)), ProfileUserOptionsWidget, SLOT( domainNameToggled(bool) ));
+ connect(ProfileUserOptionsWidget->NtDomainNameCheckbox, TQT_SIGNAL(toggled(bool)), ProfileUserOptionsWidget, TQT_SLOT( domainNameToggled(bool) ));
path.clear();
path << i18n( "Profile" ) << i18n( "Authenticate" ) << i18n( "Certificate" );
ProfileCertOptionsFrame = addVBoxPage( path, i18n( "Certificate" ), BarIcon( "certimport", KIcon::SizeSmall ) );
- lo = new QVBoxLayout( ProfileCertOptionsFrame );
+ lo = new TQVBoxLayout( ProfileCertOptionsFrame );
lo->setSpacing( KDialog::spacingHint() );
- QWidget *ProfileCertSelectorWidget = new QWidget( ProfileCertOptionsFrame );
- QHBoxLayout *ProfileCertSelectorLayout = new QHBoxLayout( ProfileCertSelectorWidget );
- QLabel *ProfileCertSelectorLabel = new QLabel( ProfileCertSelectorWidget );
+ TQWidget *ProfileCertSelectorWidget = new TQWidget( ProfileCertOptionsFrame );
+ TQHBoxLayout *ProfileCertSelectorLayout = new TQHBoxLayout( ProfileCertSelectorWidget );
+ TQLabel *ProfileCertSelectorLabel = new TQLabel( ProfileCertSelectorWidget );
ProfileCertSelectorLabel->setText( i18n( "Profile:" ) );
- ProfileCertSelector = new QComboBox( ProfileCertSelectorWidget );
+ ProfileCertSelector = new TQComboBox( ProfileCertSelectorWidget );
ProfileCertSelectorLayout->addWidget( ProfileCertSelectorLabel );
ProfileCertSelectorLayout->addWidget( ProfileCertSelector );
@@ -1110,20 +1110,20 @@ void PreferencesDialog::setupGui()
lo->addWidget( ProfileCertSelectorWidget );
lo->addWidget( ProfileCertOptionsWidget );
ProfileCertSelector->setEnabled( true );
- connect(ProfileCertOptionsWidget->ImportCertificatePushButton, SIGNAL(clicked()), this, SLOT(importCertificate()));
- connect(ProfileCertOptionsWidget->UseCiscoCertStoreCheckBox, SIGNAL(toggled(bool)), this, SLOT(useCiscoCertStoreToggled(bool)));
+ connect(ProfileCertOptionsWidget->ImportCertificatePushButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(importCertificate()));
+ connect(ProfileCertOptionsWidget->UseCiscoCertStoreCheckBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(useCiscoCertStoreToggled(bool)));
path.clear();
path << i18n( "Profile" ) << i18n( "Authenticate" ) << i18n( "Smartcard" );
ProfileSmartcardOptionsFrame = addPage( path, i18n( "Smartcard" ), BarIcon( "smartcard", KIcon::SizeSmall ) );
- lo = new QVBoxLayout( ProfileSmartcardOptionsFrame );
+ lo = new TQVBoxLayout( ProfileSmartcardOptionsFrame );
lo->setSpacing( KDialog::spacingHint() );
- QWidget *ProfileSmartcardSelectorWidget = new QWidget( ProfileSmartcardOptionsFrame );
- QHBoxLayout *ProfileSmartcardSelectorLayout = new QHBoxLayout( ProfileSmartcardSelectorWidget );
- QLabel *ProfileSmartcardSelectorLabel = new QLabel( ProfileSmartcardSelectorWidget );
+ TQWidget *ProfileSmartcardSelectorWidget = new TQWidget( ProfileSmartcardOptionsFrame );
+ TQHBoxLayout *ProfileSmartcardSelectorLayout = new TQHBoxLayout( ProfileSmartcardSelectorWidget );
+ TQLabel *ProfileSmartcardSelectorLabel = new TQLabel( ProfileSmartcardSelectorWidget );
ProfileSmartcardSelectorLabel->setText( i18n( "Profile:" ) );
- ProfileSmartcardSelector = new QComboBox( ProfileSmartcardSelectorWidget );
+ ProfileSmartcardSelector = new TQComboBox( ProfileSmartcardSelectorWidget );
ProfileSmartcardSelectorLayout->addWidget( ProfileSmartcardSelectorLabel );
ProfileSmartcardSelectorLayout->addWidget( ProfileSmartcardSelector );
@@ -1131,20 +1131,20 @@ void PreferencesDialog::setupGui()
lo->addWidget( ProfileSmartcardSelectorWidget );
lo->addWidget( ProfileSmartcardOptionsWidget );
ProfileSmartcardSelector->setEnabled( true );
- connect(ProfileSmartcardOptionsWidget->DetectPkcs11SlotsPushButton, SIGNAL(clicked()), this, SLOT(detectPkcs11Slots()));
- connect(ProfileSmartcardOptionsWidget->DetectPkcs11IdPushButton, SIGNAL(clicked()), this, SLOT(detectPkcs11Ids()));
+ connect(ProfileSmartcardOptionsWidget->DetectPkcs11SlotsPushButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(detectPkcs11Slots()));
+ connect(ProfileSmartcardOptionsWidget->DetectPkcs11IdPushButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(detectPkcs11Ids()));
path.clear();
path << i18n( "Profile" ) << i18n( "Authenticate" ) << i18n( "PSK" );
ProfilePskOptionsFrame = addPage( path, i18n( "PSK" ), BarIcon( "password", KIcon::SizeSmall ) );
- lo = new QVBoxLayout( ProfilePskOptionsFrame );
+ lo = new TQVBoxLayout( ProfilePskOptionsFrame );
lo->setSpacing( KDialog::spacingHint() );
- QWidget *ProfilePskSelectorWidget = new QWidget( ProfilePskOptionsFrame );
- QHBoxLayout *ProfilePskSelectorLayout = new QHBoxLayout( ProfilePskSelectorWidget );
- QLabel *ProfilePskSelectorLabel = new QLabel( ProfilePskSelectorWidget );
+ TQWidget *ProfilePskSelectorWidget = new TQWidget( ProfilePskOptionsFrame );
+ TQHBoxLayout *ProfilePskSelectorLayout = new TQHBoxLayout( ProfilePskSelectorWidget );
+ TQLabel *ProfilePskSelectorLabel = new TQLabel( ProfilePskSelectorWidget );
ProfilePskSelectorLabel->setText( i18n( "Profile:" ) );
- ProfilePskSelector = new QComboBox( ProfilePskSelectorWidget );
+ ProfilePskSelector = new TQComboBox( ProfilePskSelectorWidget );
ProfilePskSelectorLayout->addWidget( ProfilePskSelectorLabel );
ProfilePskSelectorLayout->addWidget( ProfilePskSelector );
@@ -1156,14 +1156,14 @@ void PreferencesDialog::setupGui()
path.clear();
path << i18n( "Profile" ) << i18n( "Network" ) << i18n( "General" );
ProfileNetworkGeneralOptionsFrame = addPage( path, i18n( "General" ), BarIcon( "network", KIcon::SizeSmall ) );
- lo = new QVBoxLayout( ProfileNetworkGeneralOptionsFrame );
+ lo = new TQVBoxLayout( ProfileNetworkGeneralOptionsFrame );
lo->setSpacing( KDialog::spacingHint() );
- QWidget *ProfileNetworkGeneralSelectorWidget = new QWidget( ProfileNetworkGeneralOptionsFrame );
- QHBoxLayout *ProfileNetworkGeneralSelectorLayout = new QHBoxLayout( ProfileNetworkGeneralSelectorWidget );
- QLabel *ProfileNetworkGeneralSelectorLabel = new QLabel( ProfileNetworkGeneralSelectorWidget );
+ TQWidget *ProfileNetworkGeneralSelectorWidget = new TQWidget( ProfileNetworkGeneralOptionsFrame );
+ TQHBoxLayout *ProfileNetworkGeneralSelectorLayout = new TQHBoxLayout( ProfileNetworkGeneralSelectorWidget );
+ TQLabel *ProfileNetworkGeneralSelectorLabel = new TQLabel( ProfileNetworkGeneralSelectorWidget );
ProfileNetworkGeneralSelectorLabel->setText( i18n( "Profile:" ) );
- ProfileNetworkGeneralSelector = new QComboBox( ProfileNetworkGeneralSelectorWidget );
+ ProfileNetworkGeneralSelector = new TQComboBox( ProfileNetworkGeneralSelectorWidget );
ProfileNetworkGeneralSelectorLayout->addWidget( ProfileNetworkGeneralSelectorLabel );
ProfileNetworkGeneralSelectorLayout->addWidget( ProfileNetworkGeneralSelector );
@@ -1176,14 +1176,14 @@ void PreferencesDialog::setupGui()
path.clear();
path << i18n( "Profile" ) << i18n( "Network" ) << i18n( "Routes" );
ProfileNetworkRouteOptionsFrame = addPage( path, i18n( "Routes" ), BarIcon( "route", KIcon::SizeSmall ) );
- lo = new QVBoxLayout( ProfileNetworkRouteOptionsFrame );
+ lo = new TQVBoxLayout( ProfileNetworkRouteOptionsFrame );
lo->setSpacing( KDialog::spacingHint() );
- QWidget *ProfileNetworkRouteSelectorWidget = new QWidget( ProfileNetworkRouteOptionsFrame );
- QHBoxLayout *ProfileNetworkRouteSelectorLayout = new QHBoxLayout( ProfileNetworkRouteSelectorWidget );
- QLabel *ProfileNetworkRouteSelectorLabel = new QLabel( ProfileNetworkRouteSelectorWidget );
+ TQWidget *ProfileNetworkRouteSelectorWidget = new TQWidget( ProfileNetworkRouteOptionsFrame );
+ TQHBoxLayout *ProfileNetworkRouteSelectorLayout = new TQHBoxLayout( ProfileNetworkRouteSelectorWidget );
+ TQLabel *ProfileNetworkRouteSelectorLabel = new TQLabel( ProfileNetworkRouteSelectorWidget );
ProfileNetworkRouteSelectorLabel->setText( i18n( "Profile:" ) );
- ProfileNetworkRouteSelector = new QComboBox( ProfileNetworkRouteSelectorWidget );
+ ProfileNetworkRouteSelector = new TQComboBox( ProfileNetworkRouteSelectorWidget );
ProfileNetworkRouteSelectorLayout->addWidget( ProfileNetworkRouteSelectorLabel );
ProfileNetworkRouteSelectorLayout->addWidget( ProfileNetworkRouteSelector );
@@ -1196,14 +1196,14 @@ void PreferencesDialog::setupGui()
path.clear();
path << i18n( "Profile" ) << i18n( "Network" ) << i18n( "NAT" );
ProfileNetworkNatOptionsFrame = addPage( path, i18n( "NAT" ), BarIcon( "application", KIcon::SizeSmall ) );
- lo = new QVBoxLayout( ProfileNetworkNatOptionsFrame );
+ lo = new TQVBoxLayout( ProfileNetworkNatOptionsFrame );
lo->setSpacing( KDialog::spacingHint() );
- QWidget *ProfileNetworkNatSelectorWidget = new QWidget( ProfileNetworkNatOptionsFrame );
- QHBoxLayout *ProfileNetworkNatSelectorLayout = new QHBoxLayout( ProfileNetworkNatSelectorWidget );
- QLabel *ProfileNetworkNatSelectorLabel = new QLabel( ProfileNetworkNatSelectorWidget );
+ TQWidget *ProfileNetworkNatSelectorWidget = new TQWidget( ProfileNetworkNatOptionsFrame );
+ TQHBoxLayout *ProfileNetworkNatSelectorLayout = new TQHBoxLayout( ProfileNetworkNatSelectorWidget );
+ TQLabel *ProfileNetworkNatSelectorLabel = new TQLabel( ProfileNetworkNatSelectorWidget );
ProfileNetworkNatSelectorLabel->setText( i18n( "Profile:" ) );
- ProfileNetworkNatSelector = new QComboBox( ProfileNetworkNatSelectorWidget );
+ ProfileNetworkNatSelector = new TQComboBox( ProfileNetworkNatSelectorWidget );
ProfileNetworkNatSelectorLayout->addWidget( ProfileNetworkNatSelectorLabel );
ProfileNetworkNatSelectorLayout->addWidget( ProfileNetworkNatSelector );
@@ -1216,14 +1216,14 @@ void PreferencesDialog::setupGui()
path.clear();
path << i18n( "Profile" ) << i18n( "Network" ) << i18n( "HTTP proxy" );
ProfileNetworkHttpProxyOptionsFrame = addPage( path, i18n( "HTTP proxy" ), BarIcon( "application", KIcon::SizeSmall ) );
- lo = new QVBoxLayout( ProfileNetworkHttpProxyOptionsFrame );
+ lo = new TQVBoxLayout( ProfileNetworkHttpProxyOptionsFrame );
lo->setSpacing( KDialog::spacingHint() );
- QWidget *ProfileNetworkHttpProxySelectorWidget = new QWidget( ProfileNetworkHttpProxyOptionsFrame );
- QHBoxLayout *ProfileNetworkHttpProxySelectorLayout = new QHBoxLayout( ProfileNetworkHttpProxySelectorWidget );
- QLabel *ProfileNetworkHttpProxySelectorLabel = new QLabel( ProfileNetworkHttpProxySelectorWidget );
+ TQWidget *ProfileNetworkHttpProxySelectorWidget = new TQWidget( ProfileNetworkHttpProxyOptionsFrame );
+ TQHBoxLayout *ProfileNetworkHttpProxySelectorLayout = new TQHBoxLayout( ProfileNetworkHttpProxySelectorWidget );
+ TQLabel *ProfileNetworkHttpProxySelectorLabel = new TQLabel( ProfileNetworkHttpProxySelectorWidget );
ProfileNetworkHttpProxySelectorLabel->setText( i18n( "Profile:" ) );
- ProfileNetworkHttpProxySelector = new QComboBox( ProfileNetworkHttpProxySelectorWidget );
+ ProfileNetworkHttpProxySelector = new TQComboBox( ProfileNetworkHttpProxySelectorWidget );
ProfileNetworkHttpProxySelectorLayout->addWidget( ProfileNetworkHttpProxySelectorLabel );
ProfileNetworkHttpProxySelectorLayout->addWidget( ProfileNetworkHttpProxySelector );
@@ -1237,14 +1237,14 @@ void PreferencesDialog::setupGui()
path.clear();
path << i18n( "Profile" ) << i18n( "Network" ) << i18n( "Virtual IP" );
ProfileNetworkVirtualIpOptionsFrame = addPage( path, i18n( "Virtual IP" ), BarIcon( "application", KIcon::SizeSmall ) );
- lo = new QVBoxLayout( ProfileNetworkVirtualIpOptionsFrame );
+ lo = new TQVBoxLayout( ProfileNetworkVirtualIpOptionsFrame );
lo->setSpacing( KDialog::spacingHint() );
- QWidget *ProfileNetworkVirtualIpSelectorWidget = new QWidget( ProfileNetworkVirtualIpOptionsFrame );
- QHBoxLayout *ProfileNetworkVirtualIpSelectorLayout = new QHBoxLayout( ProfileNetworkVirtualIpSelectorWidget );
- QLabel *ProfileNetworkVirtualIpSelectorLabel = new QLabel( ProfileNetworkVirtualIpSelectorWidget );
+ TQWidget *ProfileNetworkVirtualIpSelectorWidget = new TQWidget( ProfileNetworkVirtualIpOptionsFrame );
+ TQHBoxLayout *ProfileNetworkVirtualIpSelectorLayout = new TQHBoxLayout( ProfileNetworkVirtualIpSelectorWidget );
+ TQLabel *ProfileNetworkVirtualIpSelectorLabel = new TQLabel( ProfileNetworkVirtualIpSelectorWidget );
ProfileNetworkVirtualIpSelectorLabel->setText( i18n( "Profile:" ) );
- ProfileNetworkVirtualIpSelector = new QComboBox( ProfileNetworkVirtualIpSelectorWidget );
+ ProfileNetworkVirtualIpSelector = new TQComboBox( ProfileNetworkVirtualIpSelectorWidget );
ProfileNetworkVirtualIpSelectorLayout->addWidget( ProfileNetworkVirtualIpSelectorLabel );
ProfileNetworkVirtualIpSelectorLayout->addWidget( ProfileNetworkVirtualIpSelector );
@@ -1253,19 +1253,19 @@ void PreferencesDialog::setupGui()
lo->addWidget( ProfileNetworkVirtualIpSelectorWidget );
lo->addWidget( ProfileNetworkVirtualIpOptionsWidget );
ProfileNetworkVirtualIpSelector->setEnabled( true );
- connect(ProfileNetworkGeneralOptionsWidget->TunnelDeviceTypeComboBox, SIGNAL(activated ( const QString & )),this, SLOT(tunnelDeviceTypeChanged(const QString& )));
+ connect(ProfileNetworkGeneralOptionsWidget->TunnelDeviceTypeComboBox, TQT_SIGNAL(activated ( const TQString & )),this, TQT_SLOT(tunnelDeviceTypeChanged(const TQString& )));
path.clear();
path << i18n( "Profile" ) << i18n( "Connection specific" ) << i18n( "Cisco" );
ProfileCiscoOptionsFrame = addPage( path, i18n( "Cisco" ), BarIcon( "cisco", KIcon::SizeSmall ) );
- lo = new QVBoxLayout( ProfileCiscoOptionsFrame );
+ lo = new TQVBoxLayout( ProfileCiscoOptionsFrame );
lo->setSpacing( KDialog::spacingHint() );
- QWidget *ProfileCiscoSelectorWidget = new QWidget( ProfileCiscoOptionsFrame );
- QHBoxLayout *ProfileCiscoSelectorLayout = new QHBoxLayout( ProfileCiscoSelectorWidget );
- QLabel *ProfileCiscoSelectorLabel = new QLabel( ProfileCiscoSelectorWidget );
+ TQWidget *ProfileCiscoSelectorWidget = new TQWidget( ProfileCiscoOptionsFrame );
+ TQHBoxLayout *ProfileCiscoSelectorLayout = new TQHBoxLayout( ProfileCiscoSelectorWidget );
+ TQLabel *ProfileCiscoSelectorLabel = new TQLabel( ProfileCiscoSelectorWidget );
ProfileCiscoSelectorLabel->setText( i18n( "Profile:" ) );
- ProfileCiscoSelector = new QComboBox( ProfileCiscoSelectorWidget );
+ ProfileCiscoSelector = new TQComboBox( ProfileCiscoSelectorWidget );
ProfileCiscoSelectorLayout->addWidget( ProfileCiscoSelectorLabel );
ProfileCiscoSelectorLayout->addWidget( ProfileCiscoSelector );
@@ -1274,12 +1274,12 @@ void PreferencesDialog::setupGui()
lo->addWidget( ProfileCiscoSelectorWidget );
lo->addWidget( ProfileCiscoOptionsWidget );
ProfileCiscoSelector->setEnabled( true );
- connect (ProfileCiscoOptionsWidget->LocalPortCheckbox, SIGNAL(toggled(bool)),this, SLOT(localPortToggled(bool)));
- connect (ProfileCiscoOptionsWidget->ApplicationVersionCheckbox, SIGNAL(toggled(bool)),this, SLOT(applicationVersionToggled(bool)));
- connect (ProfileCiscoOptionsWidget->PerfectForwardSecurityCheckbox, SIGNAL(toggled(bool)),this, SLOT(perfectForwardSecurityToggled(bool)));
- connect (ProfileCiscoOptionsWidget->IkeGroupCheckbox, SIGNAL(toggled(bool)),this, SLOT(IkeGroupToggled(bool)));
- connect (ProfileCiscoOptionsWidget->SingleDesCheckbox, SIGNAL(toggled(bool)),this, SLOT(singleDesToggled(bool)));
- connect (ProfileCiscoOptionsWidget->EnableDpdIdleTimeoutCheckbox, SIGNAL(toggled(bool)),this, SLOT(dpdToggled(bool)));
+ connect (ProfileCiscoOptionsWidget->LocalPortCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(localPortToggled(bool)));
+ connect (ProfileCiscoOptionsWidget->ApplicationVersionCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(applicationVersionToggled(bool)));
+ connect (ProfileCiscoOptionsWidget->PerfectForwardSecurityCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(perfectForwardSecurityToggled(bool)));
+ connect (ProfileCiscoOptionsWidget->IkeGroupCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(IkeGroupToggled(bool)));
+ connect (ProfileCiscoOptionsWidget->SingleDesCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(singleDesToggled(bool)));
+ connect (ProfileCiscoOptionsWidget->EnableDpdIdleTimeoutCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(dpdToggled(bool)));
//ProfileCiscoOptionsWidget->PerfectForwardSecrecyCombobox->setEnabled( false );
ProfileCiscoOptionsWidget->PerfectForwardSecrecyCombobox->clear();
@@ -1298,14 +1298,14 @@ void PreferencesDialog::setupGui()
path.clear();
path << i18n( "Profile" ) << i18n( "Connection specific" ) << i18n( "Racoon" );
ProfileRacoonOptionsFrame = addPage( path, i18n( "Racoon" ), BarIcon( "kame", KIcon::SizeSmall ) );
- lo = new QVBoxLayout( ProfileRacoonOptionsFrame );
+ lo = new TQVBoxLayout( ProfileRacoonOptionsFrame );
lo->setSpacing( KDialog::spacingHint() );
- QWidget *ProfileRacoonSelectorWidget = new QWidget( ProfileRacoonOptionsFrame );
- QHBoxLayout *ProfileRacoonSelectorLayout = new QHBoxLayout( ProfileRacoonSelectorWidget );
- QLabel *ProfileRacoonSelectorLabel = new QLabel( ProfileRacoonSelectorWidget );
+ TQWidget *ProfileRacoonSelectorWidget = new TQWidget( ProfileRacoonOptionsFrame );
+ TQHBoxLayout *ProfileRacoonSelectorLayout = new TQHBoxLayout( ProfileRacoonSelectorWidget );
+ TQLabel *ProfileRacoonSelectorLabel = new TQLabel( ProfileRacoonSelectorWidget );
ProfileRacoonSelectorLabel->setText( i18n( "Profile:" ) );
- ProfileRacoonSelector = new QComboBox( ProfileRacoonSelectorWidget );
+ ProfileRacoonSelector = new TQComboBox( ProfileRacoonSelectorWidget );
ProfileRacoonSelectorLayout->addWidget( ProfileRacoonSelectorLabel );
ProfileRacoonSelectorLayout->addWidget( ProfileRacoonSelector );
@@ -1314,8 +1314,8 @@ void PreferencesDialog::setupGui()
ProfileRacoonOptionsWidget->ExchangeModeComboBox->insertItem( "aggressive", 1 );
ProfileRacoonOptionsWidget->ExchangeModeComboBox->insertItem( "base", 2 );
ProfileRacoonOptionsWidget->ExchangeModeComboBox->setCurrentItem( 0 ); // main
- connect (ProfileRacoonOptionsWidget->PerfectForwardSecurityCheckbox, SIGNAL(toggled(bool)),this, SLOT(perfectForwardSecurityToggled(bool)));
- connect (ProfileRacoonOptionsWidget->IkeGroupCheckbox, SIGNAL(toggled(bool)),this, SLOT(IkeGroupToggled(bool)));
+ connect (ProfileRacoonOptionsWidget->PerfectForwardSecurityCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(perfectForwardSecurityToggled(bool)));
+ connect (ProfileRacoonOptionsWidget->IkeGroupCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(IkeGroupToggled(bool)));
//ProfileRacoonOptionsWidget->PerfectForwardSecrecyCombobox->setEnabled( false );
ProfileRacoonOptionsWidget->PerfectForwardSecrecyCombobox->clear();
@@ -1346,20 +1346,20 @@ void PreferencesDialog::setupGui()
path.clear();
path << i18n( "Profile" ) << i18n( "Connection specific" ) << i18n( "Openswan/strongSwan" );
ProfileIpsecOptionsFrame = addPage( path, i18n( "Openswan/strongSwan" ), BarIcon( "openswan", KIcon::SizeSmall ) );
- lo = new QVBoxLayout( ProfileIpsecOptionsFrame );
+ lo = new TQVBoxLayout( ProfileIpsecOptionsFrame );
lo->setSpacing( KDialog::spacingHint() );
- QWidget *ProfileIpsecSelectorWidget = new QWidget( ProfileIpsecOptionsFrame );
- QHBoxLayout *ProfileIpsecSelectorLayout = new QHBoxLayout( ProfileIpsecSelectorWidget );
- QLabel *ProfileIpsecSelectorLabel = new QLabel( ProfileIpsecSelectorWidget );
+ TQWidget *ProfileIpsecSelectorWidget = new TQWidget( ProfileIpsecOptionsFrame );
+ TQHBoxLayout *ProfileIpsecSelectorLayout = new TQHBoxLayout( ProfileIpsecSelectorWidget );
+ TQLabel *ProfileIpsecSelectorLabel = new TQLabel( ProfileIpsecSelectorWidget );
ProfileIpsecSelectorLabel->setText( i18n( "Profile:" ) );
- ProfileIpsecSelector = new QComboBox( ProfileIpsecSelectorWidget );
+ ProfileIpsecSelector = new TQComboBox( ProfileIpsecSelectorWidget );
ProfileIpsecSelectorLayout->addWidget( ProfileIpsecSelectorLabel );
ProfileIpsecSelectorLayout->addWidget( ProfileIpsecSelector );
ProfileIpsecOptionsWidget = new ProfileIpsecOptions( ProfileIpsecOptionsFrame );
- connect (ProfileIpsecOptionsWidget->PerfectForwardSecurityCheckbox, SIGNAL(toggled(bool)),this, SLOT(perfectForwardSecurityToggled(bool)));
- connect (ProfileIpsecOptionsWidget->UseXauthCheckBox, SIGNAL(toggled(bool)),this, SLOT(useXauthToggled(bool)));
+ connect (ProfileIpsecOptionsWidget->PerfectForwardSecurityCheckbox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(perfectForwardSecurityToggled(bool)));
+ connect (ProfileIpsecOptionsWidget->UseXauthCheckBox, TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(useXauthToggled(bool)));
ProfileIpsecOptionsWidget->IpsecVpnModeCombobox->insertItem( "transport" );
ProfileIpsecOptionsWidget->IpsecVpnModeCombobox->insertItem( "tunnel" );
@@ -1386,14 +1386,14 @@ void PreferencesDialog::setupGui()
path.clear();
path << i18n( "Profile" ) << i18n( "Connection specific" ) << i18n( "OpenVPN" );
ProfileOpenvpnOptionsFrame = addPage( path, i18n( "OpenVPN" ), BarIcon( "openvpn", KIcon::SizeSmall ) );
- lo = new QVBoxLayout( ProfileOpenvpnOptionsFrame );
+ lo = new TQVBoxLayout( ProfileOpenvpnOptionsFrame );
lo->setSpacing( KDialog::spacingHint() );
- QWidget *ProfileOpenvpnSelectorWidget = new QWidget( ProfileOpenvpnOptionsFrame );
- QHBoxLayout *ProfileOpenvpnSelectorLayout = new QHBoxLayout( ProfileOpenvpnSelectorWidget );
- QLabel *ProfileOpenvpnSelectorLabel = new QLabel( ProfileOpenvpnSelectorWidget );
+ TQWidget *ProfileOpenvpnSelectorWidget = new TQWidget( ProfileOpenvpnOptionsFrame );
+ TQHBoxLayout *ProfileOpenvpnSelectorLayout = new TQHBoxLayout( ProfileOpenvpnSelectorWidget );
+ TQLabel *ProfileOpenvpnSelectorLabel = new TQLabel( ProfileOpenvpnSelectorWidget );
ProfileOpenvpnSelectorLabel->setText( i18n( "Profile:" ) );
- ProfileOpenvpnSelector = new QComboBox( ProfileOpenvpnSelectorWidget );
+ ProfileOpenvpnSelector = new TQComboBox( ProfileOpenvpnSelectorWidget );
ProfileOpenvpnSelectorLayout->addWidget( ProfileOpenvpnSelectorLabel );
ProfileOpenvpnSelectorLayout->addWidget( ProfileOpenvpnSelector );
@@ -1406,14 +1406,14 @@ void PreferencesDialog::setupGui()
path.clear();
path << i18n( "Profile" ) << i18n( "Connection specific" ) << i18n( "PPTP/L2TP" );
ProfilePptpOptionsFrame = addPage( path, i18n( "PPTP/L2TP" ), BarIcon( "application", KIcon::SizeSmall ) );
- lo = new QVBoxLayout( ProfilePptpOptionsFrame );
+ lo = new TQVBoxLayout( ProfilePptpOptionsFrame );
lo->setSpacing( KDialog::spacingHint() );
- QWidget *ProfilePptpSelectorWidget = new QWidget( ProfilePptpOptionsFrame );
- QHBoxLayout *ProfilePptpSelectorLayout = new QHBoxLayout( ProfilePptpSelectorWidget );
- QLabel *ProfilePptpSelectorLabel = new QLabel( ProfilePptpSelectorWidget );
+ TQWidget *ProfilePptpSelectorWidget = new TQWidget( ProfilePptpOptionsFrame );
+ TQHBoxLayout *ProfilePptpSelectorLayout = new TQHBoxLayout( ProfilePptpSelectorWidget );
+ TQLabel *ProfilePptpSelectorLabel = new TQLabel( ProfilePptpSelectorWidget );
ProfilePptpSelectorLabel->setText( i18n( "Profile:" ) );
- ProfilePptpSelector = new QComboBox( ProfilePptpSelectorWidget );
+ ProfilePptpSelector = new TQComboBox( ProfilePptpSelectorWidget );
ProfilePptpSelectorLayout->addWidget( ProfilePptpSelectorLabel );
ProfilePptpSelectorLayout->addWidget( ProfilePptpSelector );
@@ -1426,14 +1426,14 @@ void PreferencesDialog::setupGui()
path.clear();
path << i18n( "Profile" ) << i18n( "Connection specific" ) << i18n( "Vtun" );
ProfileVtunOptionsFrame = addPage( path, i18n( "Vtun" ), BarIcon( "application", KIcon::SizeSmall ) );
- lo = new QVBoxLayout( ProfileVtunOptionsFrame );
+ lo = new TQVBoxLayout( ProfileVtunOptionsFrame );
lo->setSpacing( KDialog::spacingHint() );
- QWidget *ProfileVtunSelectorWidget = new QWidget( ProfileVtunOptionsFrame );
- QHBoxLayout *ProfileVtunSelectorLayout = new QHBoxLayout( ProfileVtunSelectorWidget );
- QLabel *ProfileVtunSelectorLabel = new QLabel( ProfileVtunSelectorWidget );
+ TQWidget *ProfileVtunSelectorWidget = new TQWidget( ProfileVtunOptionsFrame );
+ TQHBoxLayout *ProfileVtunSelectorLayout = new TQHBoxLayout( ProfileVtunSelectorWidget );
+ TQLabel *ProfileVtunSelectorLabel = new TQLabel( ProfileVtunSelectorWidget );
ProfileVtunSelectorLabel->setText( i18n( "Profile:" ) );
- ProfileVtunSelector = new QComboBox( ProfileVtunSelectorWidget );
+ ProfileVtunSelector = new TQComboBox( ProfileVtunSelectorWidget );
ProfileVtunSelectorLayout->addWidget( ProfileVtunSelectorLabel );
ProfileVtunSelectorLayout->addWidget( ProfileVtunSelector );
@@ -1446,14 +1446,14 @@ void PreferencesDialog::setupGui()
path.clear();
path << i18n( "Profile" ) << i18n( "Connection specific" ) << i18n( "SSH" );
ProfileSshOptionsFrame = addPage( path, i18n( "SSH" ), BarIcon( "openssh", KIcon::SizeSmall ) );
- lo = new QVBoxLayout( ProfileSshOptionsFrame );
+ lo = new TQVBoxLayout( ProfileSshOptionsFrame );
lo->setSpacing( KDialog::spacingHint() );
- QWidget *ProfileSshSelectorWidget = new QWidget( ProfileSshOptionsFrame );
- QHBoxLayout *ProfileSshSelectorLayout = new QHBoxLayout( ProfileSshSelectorWidget );
- QLabel *ProfileSshSelectorLabel = new QLabel( ProfileSshSelectorWidget );
+ TQWidget *ProfileSshSelectorWidget = new TQWidget( ProfileSshOptionsFrame );
+ TQHBoxLayout *ProfileSshSelectorLayout = new TQHBoxLayout( ProfileSshSelectorWidget );
+ TQLabel *ProfileSshSelectorLabel = new TQLabel( ProfileSshSelectorWidget );
ProfileSshSelectorLabel->setText( i18n( "Profile:" ) );
- ProfileSshSelector = new QComboBox( ProfileSshSelectorWidget );
+ ProfileSshSelector = new TQComboBox( ProfileSshSelectorWidget );
ProfileSshSelectorLayout->addWidget( ProfileSshSelectorLabel );
ProfileSshSelectorLayout->addWidget( ProfileSshSelector );
@@ -1463,31 +1463,31 @@ void PreferencesDialog::setupGui()
lo->addWidget( ProfileSshOptionsWidget );
ProfileSshSelector->setEnabled( true );
ProfileSshOptionsWidget->SshKeyComboBox->clear();
- QString Home= QString(getenv("HOME"));
+ TQString Home= TQString(getenv("HOME"));
if (!Home.isEmpty())
{
- QDir dir( Home+"/.ssh" );
- QStringList KeyFiles = dir.entryList( "*" );
+ TQDir dir( Home+"/.ssh" );
+ TQStringList KeyFiles = dir.entryList( "*" );
//if (GlobalConfig->KvpncDebugLevel > 2)
//{
- // GlobalConfig->appendLogEntry(i18n("SSH files: %1").arg(KeyFiles.join(",")),GlobalConfig->debug);
+ // GlobalConfig->appendLogEntry(i18n("SSH files: %1").tqarg(KeyFiles.join(",")),GlobalConfig->debug);
//}
if (KeyFiles.size() > 1)
{
- for ( QStringList::Iterator it = KeyFiles.begin(); it != KeyFiles.end(); ++it )
+ for ( TQStringList::Iterator it = KeyFiles.begin(); it != KeyFiles.end(); ++it )
{
- QString item = QString(*it);
+ TQString item = TQString(*it);
if (GlobalConfig->KvpncDebugLevel > 2)
{
- GlobalConfig->appendLogEntry(i18n("processing entry: %1").arg(item),GlobalConfig->debug);
+ GlobalConfig->appendLogEntry(i18n("processing entry: %1").tqarg(item),GlobalConfig->debug);
}
if (!item.contains (".pub", false) && !item.contains ("authorized_keys", false) && !item.contains ("known_hosts", false) && !item.contains (".", false) && !item.contains ("..", false) && !item.contains ("config", false) )
{
if (GlobalConfig->KvpncDebugLevel > 2)
{
- GlobalConfig->appendLogEntry(i18n("SSH key found: %1").arg(*it),GlobalConfig->debug);
+ GlobalConfig->appendLogEntry(i18n("SSH key found: %1").tqarg(*it),GlobalConfig->debug);
}
ProfileSshOptionsWidget->SshKeyComboBox->insertItem(*it);
}
@@ -1500,14 +1500,14 @@ void PreferencesDialog::setupGui()
path.clear();
path << i18n( "Profile" ) << i18n( "Command Execution" ) << i18n( "Before Connect" );
ProfileCmdExecBeforeConnectOptionsFrame = addPage( path, i18n( "Before Connect" ), BarIcon( "exec", KIcon::SizeSmall ) );
- lo = new QVBoxLayout( ProfileCmdExecBeforeConnectOptionsFrame );
+ lo = new TQVBoxLayout( ProfileCmdExecBeforeConnectOptionsFrame );
lo->setSpacing( KDialog::spacingHint() );
- QWidget *ProfileCmdExecBeforeConnectSelectorWidget = new QWidget( ProfileCmdExecBeforeConnectOptionsFrame );
- QHBoxLayout *ProfileCmdExecBeforeConnectSelectorLayout = new QHBoxLayout( ProfileCmdExecBeforeConnectSelectorWidget );
- QLabel *ProfileCmdExecBeforeConnectSelectorLabel = new QLabel( ProfileCmdExecBeforeConnectSelectorWidget );
+ TQWidget *ProfileCmdExecBeforeConnectSelectorWidget = new TQWidget( ProfileCmdExecBeforeConnectOptionsFrame );
+ TQHBoxLayout *ProfileCmdExecBeforeConnectSelectorLayout = new TQHBoxLayout( ProfileCmdExecBeforeConnectSelectorWidget );
+ TQLabel *ProfileCmdExecBeforeConnectSelectorLabel = new TQLabel( ProfileCmdExecBeforeConnectSelectorWidget );
ProfileCmdExecBeforeConnectSelectorLabel->setText( i18n( "Profile:" ) );
- ProfileCmdExecBeforeConnectSelector = new QComboBox( ProfileCmdExecBeforeConnectSelectorWidget );
+ ProfileCmdExecBeforeConnectSelector = new TQComboBox( ProfileCmdExecBeforeConnectSelectorWidget );
ProfileCmdExecBeforeConnectSelectorLayout->addWidget( ProfileCmdExecBeforeConnectSelectorLabel );
ProfileCmdExecBeforeConnectSelectorLayout->addWidget( ProfileCmdExecBeforeConnectSelector );
@@ -1520,14 +1520,14 @@ void PreferencesDialog::setupGui()
path.clear();
path << i18n( "Profile" ) << i18n( "Command Execution" ) << i18n( "After Connect" );
ProfileCmdExecAfterConnectOptionsFrame = addPage( path, i18n( "After Connect" ), BarIcon( "exec", KIcon::SizeSmall ) );
- lo = new QVBoxLayout( ProfileCmdExecAfterConnectOptionsFrame );
+ lo = new TQVBoxLayout( ProfileCmdExecAfterConnectOptionsFrame );
lo->setSpacing( KDialog::spacingHint() );
- QWidget *ProfileCmdExecAfterConnectSelectorWidget = new QWidget( ProfileCmdExecAfterConnectOptionsFrame );
- QHBoxLayout *ProfileCmdExecAfterConnectSelectorLayout = new QHBoxLayout( ProfileCmdExecAfterConnectSelectorWidget );
- QLabel *ProfileCmdExecAfterConnectSelectorLabel = new QLabel( ProfileCmdExecAfterConnectSelectorWidget );
+ TQWidget *ProfileCmdExecAfterConnectSelectorWidget = new TQWidget( ProfileCmdExecAfterConnectOptionsFrame );
+ TQHBoxLayout *ProfileCmdExecAfterConnectSelectorLayout = new TQHBoxLayout( ProfileCmdExecAfterConnectSelectorWidget );
+ TQLabel *ProfileCmdExecAfterConnectSelectorLabel = new TQLabel( ProfileCmdExecAfterConnectSelectorWidget );
ProfileCmdExecAfterConnectSelectorLabel->setText( i18n( "Profile:" ) );
- ProfileCmdExecAfterConnectSelector = new QComboBox( ProfileCmdExecAfterConnectSelectorWidget );
+ ProfileCmdExecAfterConnectSelector = new TQComboBox( ProfileCmdExecAfterConnectSelectorWidget );
ProfileCmdExecAfterConnectSelectorLayout->addWidget( ProfileCmdExecAfterConnectSelectorLabel );
ProfileCmdExecAfterConnectSelectorLayout->addWidget( ProfileCmdExecAfterConnectSelector );
@@ -1539,14 +1539,14 @@ void PreferencesDialog::setupGui()
path.clear();
path << i18n( "Profile" ) << i18n( "Command Execution" ) << i18n( "Before Disconnect" );
ProfileCmdExecBeforeDisconnectOptionsFrame = addPage( path, i18n( "Before Disconnect" ), BarIcon( "exec", KIcon::SizeSmall ) );
- lo = new QVBoxLayout( ProfileCmdExecBeforeDisconnectOptionsFrame );
+ lo = new TQVBoxLayout( ProfileCmdExecBeforeDisconnectOptionsFrame );
lo->setSpacing( KDialog::spacingHint() );
- QWidget *ProfileCmdExecBeforeDisconnectSelectorWidget = new QWidget( ProfileCmdExecBeforeDisconnectOptionsFrame );
- QHBoxLayout *ProfileCmdExecBeforeDisconnectSelectorLayout = new QHBoxLayout( ProfileCmdExecBeforeDisconnectSelectorWidget );
- QLabel *ProfileCmdExecBeforeDisconnectSelectorLabel = new QLabel( ProfileCmdExecBeforeDisconnectSelectorWidget );
+ TQWidget *ProfileCmdExecBeforeDisconnectSelectorWidget = new TQWidget( ProfileCmdExecBeforeDisconnectOptionsFrame );
+ TQHBoxLayout *ProfileCmdExecBeforeDisconnectSelectorLayout = new TQHBoxLayout( ProfileCmdExecBeforeDisconnectSelectorWidget );
+ TQLabel *ProfileCmdExecBeforeDisconnectSelectorLabel = new TQLabel( ProfileCmdExecBeforeDisconnectSelectorWidget );
ProfileCmdExecBeforeDisconnectSelectorLabel->setText( i18n( "Profile:" ) );
- ProfileCmdExecBeforeDisconnectSelector = new QComboBox( ProfileCmdExecBeforeDisconnectSelectorWidget );
+ ProfileCmdExecBeforeDisconnectSelector = new TQComboBox( ProfileCmdExecBeforeDisconnectSelectorWidget );
ProfileCmdExecBeforeDisconnectSelectorLayout->addWidget( ProfileCmdExecBeforeDisconnectSelectorLabel );
ProfileCmdExecBeforeDisconnectSelectorLayout->addWidget( ProfileCmdExecBeforeDisconnectSelector );
@@ -1558,14 +1558,14 @@ void PreferencesDialog::setupGui()
path.clear();
path << i18n( "Profile" ) << i18n( "Command Execution" ) << i18n( "After Disconnect" );
ProfileCmdExecAfterDisconnectOptionsFrame = addPage( path, i18n( "Command Execute After Disconnect" ), BarIcon( "exec", KIcon::SizeSmall ) );
- lo = new QVBoxLayout( ProfileCmdExecAfterDisconnectOptionsFrame );
+ lo = new TQVBoxLayout( ProfileCmdExecAfterDisconnectOptionsFrame );
lo->setSpacing( KDialog::spacingHint() );
- QWidget *ProfileCmdExecAfterDisconnectSelectorWidget = new QWidget( ProfileCmdExecAfterDisconnectOptionsFrame );
- QHBoxLayout *ProfileCmdExecAfterDisconnectSelectorLayout = new QHBoxLayout( ProfileCmdExecAfterDisconnectSelectorWidget );
- QLabel *ProfileCmdExecAfterDisconnectSelectorLabel = new QLabel( ProfileCmdExecAfterDisconnectSelectorWidget );
+ TQWidget *ProfileCmdExecAfterDisconnectSelectorWidget = new TQWidget( ProfileCmdExecAfterDisconnectOptionsFrame );
+ TQHBoxLayout *ProfileCmdExecAfterDisconnectSelectorLayout = new TQHBoxLayout( ProfileCmdExecAfterDisconnectSelectorWidget );
+ TQLabel *ProfileCmdExecAfterDisconnectSelectorLabel = new TQLabel( ProfileCmdExecAfterDisconnectSelectorWidget );
ProfileCmdExecAfterDisconnectSelectorLabel->setText( i18n( "Profile:" ) );
- ProfileCmdExecAfterDisconnectSelector = new QComboBox( ProfileCmdExecAfterDisconnectSelectorWidget );
+ ProfileCmdExecAfterDisconnectSelector = new TQComboBox( ProfileCmdExecAfterDisconnectSelectorWidget );
ProfileCmdExecAfterDisconnectSelectorLayout->addWidget( ProfileCmdExecAfterDisconnectSelectorLabel );
ProfileCmdExecAfterDisconnectSelectorLayout->addWidget( ProfileCmdExecAfterDisconnectSelector );
@@ -1574,8 +1574,8 @@ void PreferencesDialog::setupGui()
lo->addWidget( ProfileCmdExecAfterDisconnectOptionsWidget );
ProfileCmdExecAfterDisconnectSelector->setEnabled( true );
-// resize(QSize(800,600));
-// setFixedSize(QSize(800,600));
+// resize(TQSize(800,600));
+// setFixedSize(TQSize(800,600));
// adjustSize();
if ( !showOnlyProfiles )
@@ -1583,7 +1583,7 @@ void PreferencesDialog::setupGui()
// DaemonScrollView->adjustSize();
// DaemonScrollView->updateContents();
// ConfigDaemonOptionsWidget->resize(ConfigDaemonOptionsWidget->height(),DaemonScrollView->visibleWidth()-100);
- ConfigDaemonOptionsWidget->sizeHint();
+ ConfigDaemonOptionsWidget->tqsizeHint();
}
// CertScrollView->adjustSize();
// CertScrollView->updateContents();
@@ -1596,43 +1596,43 @@ void PreferencesDialog::setupGui()
// enableButtonApply(false);
/* connect profile combobox of each profile widget */
- connect( ProfileGeneralSelector, SIGNAL( activated ( const QString& ) ), this, SLOT( profileChanged( const QString& ) ) );
- connect( ProfileNetworkRouteSelector, SIGNAL( activated ( const QString& ) ), this, SLOT( profileChanged( const QString& ) ) );
- connect( ProfileNetworkGeneralSelector, SIGNAL( activated ( const QString& ) ), this, SLOT( profileChanged( const QString& ) ) );
- connect( ProfileNetworkNatSelector, SIGNAL( activated ( const QString& ) ), this, SLOT( profileChanged( const QString& ) ) );
- connect( ProfileNetworkHttpProxySelector, SIGNAL( activated ( const QString& ) ), this, SLOT( profileChanged( const QString& ) ) );
- connect( ProfileNetworkVirtualIpSelector, SIGNAL( activated ( const QString& ) ), this, SLOT( profileChanged( const QString& ) ) );
- connect( ProfileCertSelector, SIGNAL( activated ( const QString& ) ), this, SLOT( profileChanged( const QString& ) ) );
- connect( ProfileSmartcardSelector, SIGNAL( activated ( const QString& ) ), this, SLOT( profileChanged( const QString& ) ) );
- connect( ProfilePskSelector, SIGNAL( activated ( const QString& ) ), this, SLOT( profileChanged( const QString& ) ) );
- connect( ProfileUserSelector, SIGNAL( activated ( const QString& ) ), this, SLOT( profileChanged( const QString& ) ) );
- connect( ProfileOpenvpnSelector, SIGNAL( activated ( const QString& ) ), this, SLOT( profileChanged( const QString& ) ) );
- connect( ProfilePptpSelector, SIGNAL( activated ( const QString& ) ), this, SLOT( profileChanged( const QString& ) ) );
- connect( ProfileRacoonSelector, SIGNAL( activated ( const QString& ) ), this, SLOT( profileChanged( const QString& ) ) );
- connect( ProfileIpsecSelector, SIGNAL( activated ( const QString& ) ), this, SLOT( profileChanged( const QString& ) ) );
- connect( ProfileCiscoSelector, SIGNAL( activated ( const QString& ) ), this, SLOT( profileChanged( const QString& ) ) );
- connect( ProfileVtunSelector, SIGNAL( activated ( const QString& ) ), this, SLOT( profileChanged( const QString& ) ) );
- connect( ProfileSshSelector, SIGNAL( activated ( const QString& ) ), this, SLOT( profileChanged( const QString& ) ) );
- connect( ProfileCmdExecBeforeConnectSelector, SIGNAL( activated ( const QString& ) ), this, SLOT( profileChanged( const QString& ) ) );
- connect( ProfileCmdExecBeforeDisconnectSelector, SIGNAL( activated ( const QString& ) ), this, SLOT( profileChanged( const QString& ) ) );
- connect( ProfileCmdExecAfterConnectSelector, SIGNAL( activated ( const QString& ) ), this, SLOT( profileChanged( const QString& ) ) );
- connect( ProfileCmdExecAfterDisconnectSelector, SIGNAL( activated ( const QString& ) ), this, SLOT( profileChanged( const QString& ) ) );
-
- connect( ProfileOpenvpnOptionsWidget->AuthWithUsernameAndPasswordCheckBox, SIGNAL( toggled ( bool ) ), this, SLOT( userAuthToggled( bool ) ) );
+ connect( ProfileGeneralSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) );
+ connect( ProfileNetworkRouteSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) );
+ connect( ProfileNetworkGeneralSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) );
+ connect( ProfileNetworkNatSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) );
+ connect( ProfileNetworkHttpProxySelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) );
+ connect( ProfileNetworkVirtualIpSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) );
+ connect( ProfileCertSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) );
+ connect( ProfileSmartcardSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) );
+ connect( ProfilePskSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) );
+ connect( ProfileUserSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) );
+ connect( ProfileOpenvpnSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) );
+ connect( ProfilePptpSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) );
+ connect( ProfileRacoonSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) );
+ connect( ProfileIpsecSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) );
+ connect( ProfileCiscoSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) );
+ connect( ProfileVtunSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) );
+ connect( ProfileSshSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) );
+ connect( ProfileCmdExecBeforeConnectSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) );
+ connect( ProfileCmdExecBeforeDisconnectSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) );
+ connect( ProfileCmdExecAfterConnectSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) );
+ connect( ProfileCmdExecAfterDisconnectSelector, TQT_SIGNAL( activated ( const TQString& ) ), this, TQT_SLOT( profileChanged( const TQString& ) ) );
+
+ connect( ProfileOpenvpnOptionsWidget->AuthWithUsernameAndPasswordCheckBox, TQT_SIGNAL( toggled ( bool ) ), this, TQT_SLOT( userAuthToggled( bool ) ) );
-// connect( ProfileCertOptionsWidget->UseSpecialServerSmartcardificateCheckBox, SIGNAL (toggled(bool)), SLOT(useSpecialServerSmartcardificateToggled(bool) ) );
- connect( ProfileCertOptionsWidget->AuthTypeComboBox, SIGNAL( activated ( int ) ), this, SLOT( authTypeChanged( int ) ) );
- connect( ProfilePskOptionsWidget->AuthTypeComboBox, SIGNAL( activated ( int ) ), this, SLOT( authTypeChanged( int ) ) );
+// connect( ProfileCertOptionsWidget->UseSpecialServerSmartcardificateCheckBox, TQT_SIGNAL (toggled(bool)), TQT_SLOT(useSpecialServerSmartcardificateToggled(bool) ) );
+ connect( ProfileCertOptionsWidget->AuthTypeComboBox, TQT_SIGNAL( activated ( int ) ), this, TQT_SLOT( authTypeChanged( int ) ) );
+ connect( ProfilePskOptionsWidget->AuthTypeComboBox, TQT_SIGNAL( activated ( int ) ), this, TQT_SLOT( authTypeChanged( int ) ) );
-// connect ( ProfileGeneralOptionsWidget->NewSessionPushButton , SIGNAL( clicked () ), this, SLOT( newSessionClicked() ) );
- connect ( ProfileGeneralOptionsWidget->SaveSessionPushButton, SIGNAL( clicked () ), this, SLOT( saveSessionClicked() ) );
- connect ( ProfileGeneralOptionsWidget->RenameSessionPushButton, SIGNAL( clicked () ), this, SLOT( renameSessionClicked() ) );
- connect ( ProfileGeneralOptionsWidget->DeleteSessionPushButton, SIGNAL( clicked () ), this, SLOT( deleteSessionClicked() ) );
- connect ( this, SIGNAL( aboutToShowPage( QWidget * ) ), this, SLOT( pageChanged( QWidget * ) ) );
- connect ( this, SIGNAL( applyClicked () ), this, SLOT( saveSessionClicked() ) );
+// connect ( ProfileGeneralOptionsWidget->NewSessionPushButton , TQT_SIGNAL( clicked () ), this, TQT_SLOT( newSessionClicked() ) );
+ connect ( ProfileGeneralOptionsWidget->SaveSessionPushButton, TQT_SIGNAL( clicked () ), this, TQT_SLOT( saveSessionClicked() ) );
+ connect ( ProfileGeneralOptionsWidget->RenameSessionPushButton, TQT_SIGNAL( clicked () ), this, TQT_SLOT( renameSessionClicked() ) );
+ connect ( ProfileGeneralOptionsWidget->DeleteSessionPushButton, TQT_SIGNAL( clicked () ), this, TQT_SLOT( deleteSessionClicked() ) );
+ connect ( this, TQT_SIGNAL( aboutToShowPage( TQWidget * ) ), this, TQT_SLOT( pageChanged( TQWidget * ) ) );
+ connect ( this, TQT_SIGNAL( applyClicked () ), this, TQT_SLOT( saveSessionClicked() ) );
}
@@ -1717,14 +1717,14 @@ void PreferencesDialog::accept()
saveSessionClicked();
if ( canAccept )
- QDialog::accept();
+ TQDialog::accept();
}
void PreferencesDialog::reject()
{
if (configChanged)
saveSessionClicked();
- QDialog::reject();
+ TQDialog::reject();
}
void PreferencesDialog::slotApply()
@@ -1760,9 +1760,9 @@ void PreferencesDialog::connectionTypeChanged( int type )
if ( GlobalConfig->KvpncDebugLevel > 1 )
- GlobalConfig->appendLogEntry( i18n( "connectionTypeChanged(): %1" ).arg( QString().setNum( type ) ), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( i18n( "connectionTypeChanged(): %1" ).tqarg( TQString().setNum( type ) ), GlobalConfig->debug );
- // KMessageBox::information(0,"connection type changed: "+QString().setNum(type),QString("type set"));
+ // KMessageBox::information(0,"connection type changed: "+TQString().setNum(type),TQString("type set"));
if ( GlobalConfig->currentProfile == 0 )
return ;
@@ -1832,27 +1832,27 @@ void PreferencesDialog::connectionTypeChanged( int type )
{
if ( GlobalConfig->KvpncDebugLevel > 0 )
- GlobalConfig->appendLogEntry( i18n( "New type: %1" ).arg( "racoon" ), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( i18n( "New type: %1" ).tqarg( "racoon" ), GlobalConfig->debug );
}
else if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_racoon )
{
if ( GlobalConfig->KvpncDebugLevel > 0 )
- GlobalConfig->appendLogEntry( i18n( "New type: %1" ).arg( "l2tpd (racoon)" ), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( i18n( "New type: %1" ).tqarg( "l2tpd (racoon)" ), GlobalConfig->debug );
}
else if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::freeswan )
{
if ( GlobalConfig->KvpncDebugLevel > 0 )
- GlobalConfig->appendLogEntry( i18n( "New type: %1" ).arg( "ipsec (openswan/strongswan)" ), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( i18n( "New type: %1" ).tqarg( "ipsec (openswan/strongswan)" ), GlobalConfig->debug );
}
else if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_freeswan )
{
if ( GlobalConfig->KvpncDebugLevel > 0 )
- GlobalConfig->appendLogEntry( i18n( "New type: %1" ).arg( "l2tpd (openswan/strongswan)" ), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( i18n( "New type: %1" ).tqarg( "l2tpd (openswan/strongswan)" ), GlobalConfig->debug );
}
else if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::pptp )
{
@@ -1862,7 +1862,7 @@ void PreferencesDialog::connectionTypeChanged( int type )
else if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::openvpn )
{
if ( GlobalConfig->KvpncDebugLevel > 0 )
- GlobalConfig->appendLogEntry( i18n( "new type: %1" ).arg( "openvpn" ), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( i18n( "new type: %1" ).tqarg( "openvpn" ), GlobalConfig->debug );
ProfileNetworkGeneralOptionsWidget->RemoteNetAddrLineEdit->setEnabled( false );
ProfileNetworkGeneralOptionsWidget->LabelRemoteNetwork->setEnabled( false );
@@ -1884,7 +1884,7 @@ void PreferencesDialog::connectionTypeChanged( int type )
else if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::vtun )
{
if ( GlobalConfig->KvpncDebugLevel > 0 )
- GlobalConfig->appendLogEntry( i18n( "new type: %1" ).arg( "Vtun" ), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( i18n( "new type: %1" ).tqarg( "Vtun" ), GlobalConfig->debug );
ProfileNetworkGeneralOptionsWidget->RemoteNetAddrLineEdit->setEnabled( false );
ProfileNetworkGeneralOptionsWidget->LabelRemoteNetwork->setEnabled( false );
@@ -1906,7 +1906,7 @@ void PreferencesDialog::connectionTypeChanged( int type )
else if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::ssh )
{
if ( GlobalConfig->KvpncDebugLevel > 0 )
- GlobalConfig->appendLogEntry( i18n( "new type: %1" ).arg( "SSH" ), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( i18n( "new type: %1" ).tqarg( "SSH" ), GlobalConfig->debug );
ProfileNetworkGeneralOptionsWidget->RemoteNetAddrLineEdit->setEnabled( false );
ProfileNetworkGeneralOptionsWidget->LabelRemoteNetwork->setEnabled( false );
@@ -1988,7 +1988,7 @@ void PreferencesDialog::authTypeChanged( int authtype )
{
if ( GlobalConfig->currentProfile == 0 )
return ;
- QComboBox *signalsender = (QComboBox *) QObject::sender ();
+ TQComboBox *signalsender = (TQComboBox *) TQObject::sender ();
VpnAccountData::AuthenticationType oldAuthType = GlobalConfig->currentProfile->getAuthType();
if (signalsender == ProfileCertOptionsWidget->AuthTypeComboBox)
{
@@ -2004,7 +2004,7 @@ void PreferencesDialog::authTypeChanged( int authtype )
authtype = VpnAccountData::hybrid;
}
}
- GlobalConfig->appendLogEntry( i18n( "authtype changed by %1." ).arg( "ProfileCertOptionsWidget" ) , GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( i18n( "authtype changed by %1." ).tqarg( "ProfileCertOptionsWidget" ) , GlobalConfig->debug );
if ( ProfileCertOptionsWidget->AuthTypeComboBox->currentText() == i18n( "X.509 Certificate" ))
GlobalConfig->currentProfile->setAuthType(VpnAccountData::cert);
else if ( ProfileCertOptionsWidget->AuthTypeComboBox->currentText() == i18n( "Pre Shared Key" ))
@@ -2027,7 +2027,7 @@ void PreferencesDialog::authTypeChanged( int authtype )
authtype = VpnAccountData::hybrid;
}
}
- GlobalConfig->appendLogEntry( i18n( "authtype changed by %1." ).arg( "ProfilePskOptionsWidget" ) , GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( i18n( "authtype changed by %1." ).tqarg( "ProfilePskOptionsWidget" ) , GlobalConfig->debug );
if ( ProfilePskOptionsWidget->AuthTypeComboBox->currentText() == i18n( "X.509 Certificate" ))
GlobalConfig->currentProfile->setAuthType(VpnAccountData::cert);
else if ( ProfilePskOptionsWidget->AuthTypeComboBox->currentText() == i18n( "Pre Shared Key" ))
@@ -2044,7 +2044,7 @@ void PreferencesDialog::authTypeChanged( int authtype )
if ( GlobalConfig->KvpncDebugLevel > 0 )
{
- QString type="unknown";
+ TQString type="unknown";
if ( GlobalConfig->currentProfile->getAuthType() == VpnAccountData::cert )
type = "cert";
else if ( GlobalConfig->currentProfile->getAuthType() == VpnAccountData::psk )
@@ -2055,7 +2055,7 @@ void PreferencesDialog::authTypeChanged( int authtype )
type ="unknown auth";
- GlobalConfig->appendLogEntry( i18n( "New authtype: \"%1\"." ).arg( type ) , GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( i18n( "New authtype: \"%1\"." ).tqarg( type ) , GlobalConfig->debug );
}
ProfilePskOptionsWidget->PskGroupBox->setEnabled( false );
@@ -2385,7 +2385,7 @@ void PreferencesDialog::authTypeChanged( int authtype )
}
}
-void PreferencesDialog::profileChanged( const QString& itemtext )
+void PreferencesDialog::profileChanged( const TQString& itemtext )
{
if ( !GlobalConfig->AccountList->isEmpty() && !itemtext.isEmpty() )
@@ -2420,7 +2420,7 @@ void PreferencesDialog::profileChanged( const QString& itemtext )
ProfileGeneralOptionsWidget->SaveSessionPushButton->setEnabled( true );
}
- QString Name = itemtext;
+ TQString Name = itemtext;
lastProfileName = Name;
ProfileGeneralOptionsWidget->setEnabled( true );
@@ -2471,7 +2471,7 @@ void PreferencesDialog::profileChanged( const QString& itemtext )
ProfileCmdExecAfterDisconnectSelector->setCurrentText( lastProfileName );
if ( GlobalConfig->KvpncDebugLevel > 0 )
- GlobalConfig->appendLogEntry( i18n( "New profile: %1" ).arg( Name ), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( i18n( "New profile: %1" ).tqarg( Name ), GlobalConfig->debug );
profileHasChanged=true;
NewProfileName = Name;
@@ -2529,7 +2529,7 @@ void PreferencesDialog::profileChanged( const QString& itemtext )
ProfileGeneralOptionsWidget->gatewayLineEdit->setText( it->getGateway() );
- if (GlobalConfig->currentProfile->getTunnelDeviceType() == QString("tap"))
+ if (GlobalConfig->currentProfile->getTunnelDeviceType() == TQString("tap"))
ProfileNetworkGeneralOptionsWidget->TunnelDeviceTypeComboBox->setCurrentItem(1);
else
ProfileNetworkGeneralOptionsWidget->TunnelDeviceTypeComboBox->setCurrentItem(0);
@@ -2541,18 +2541,18 @@ void PreferencesDialog::profileChanged( const QString& itemtext )
ProfileNetworkGeneralOptionsWidget->NetworkDeviceComboBox->setCurrentText( "default" );
if ( GlobalConfig->KvpncDebugLevel > 2 )
- GlobalConfig->appendLogEntry( i18n( "profile \"%1\": no network device defined, using \"default\"." ).arg( it->getName() ), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( i18n( "profile \"%1\": no network device defined, using \"default\"." ).tqarg( it->getName() ), GlobalConfig->debug );
}
else
{
ProfileNetworkGeneralOptionsWidget->NetworkDeviceComboBox->setCurrentText( it->getNetworkDevice() );
if ( GlobalConfig->KvpncDebugLevel > 2 )
- GlobalConfig->appendLogEntry( i18n( "profile \"%1\": network device defined, using \"%2\"." ).arg( it->getName() ).arg( it->getNetworkDevice() ), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry( i18n( "profile \"%1\": network device defined, using \"%2\"." ).tqarg( it->getName() ).tqarg( it->getNetworkDevice() ), GlobalConfig->debug );
}
ProfileGeneralOptionsWidget->ConnectionTypeComboBox->setCurrentItem( it->getConnectionType() );
- // KMessageBox::information(0,"profilechanged() new conntype: "+QString().setNum(it->getConnectionType()),QString("type set"));
+ // KMessageBox::information(0,"profilechanged() new conntype: "+TQString().setNum(it->getConnectionType()),TQString("type set"));
ProfileGeneralOptionsWidget->gatewayLineEdit->setText( it->getGateway() );
@@ -2593,9 +2593,9 @@ void PreferencesDialog::profileChanged( const QString& itemtext )
ProfileNetworkNatOptionsWidget->UdpPortCheckbox->setEnabled( false );
if ( it->getConnectionType() == VpnAccountData::openvpn )
- connect ( ProfileNetworkNatOptionsWidget->UseUdpCheckbox, SIGNAL( toggled( bool ) ), this, SLOT( useUdpToggled( bool ) ) );
+ connect ( ProfileNetworkNatOptionsWidget->UseUdpCheckbox, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( useUdpToggled( bool ) ) );
else
- disconnect ( ProfileNetworkNatOptionsWidget->UseUdpCheckbox, SIGNAL( toggled( bool ) ), this, SLOT( useUdpToggled( bool ) ) );
+ disconnect ( ProfileNetworkNatOptionsWidget->UseUdpCheckbox, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( useUdpToggled( bool ) ) );
ProfileNetworkGeneralOptionsWidget->MtuCheckbox->setChecked( it->getUseMtu() );
@@ -2659,7 +2659,7 @@ void PreferencesDialog::profileChanged( const QString& itemtext )
ProfileCertOptionsWidget->LabelPrivateKeyPassword->setText(i18n("Private key passphrase:"));
ProfileCertOptionsWidget->LabelCertificate->setText(i18n("Certificate:"));
ProfileCertOptionsWidget->x509certURLRequester->show();
- ProfileCertOptionsWidget->x509certURLRequester->sizeHint();
+ ProfileCertOptionsWidget->x509certURLRequester->tqsizeHint();
ProfileCertOptionsWidget->x509certComboBox->hide();
ProfileCertOptionsWidget->UseCiscoCertStoreCheckBox->hide();
ProfileCertOptionsWidget->VerifyCaCertCheckBox->setEnabled(false);
@@ -2767,8 +2767,8 @@ void PreferencesDialog::profileChanged( const QString& itemtext )
ProfileCertOptionsWidget->x509certComboBox->show();
ProfileCertOptionsWidget->CaCertpathURLRequester->hide();
ProfileCertOptionsWidget->CaCertpathComboBox->show();
- ProfileCertOptionsWidget->x509certComboBox->sizeHint();
- ProfileCertOptionsWidget->sizeHint();
+ ProfileCertOptionsWidget->x509certComboBox->tqsizeHint();
+ ProfileCertOptionsWidget->tqsizeHint();
ProfileCertOptionsWidget->UseCiscoCertStoreCheckBox->setChecked(true);
}
else
@@ -2777,32 +2777,32 @@ void PreferencesDialog::profileChanged( const QString& itemtext )
ProfileCertOptionsWidget->CaCertpathURLRequester->show();
ProfileCertOptionsWidget->x509certComboBox->hide();
ProfileCertOptionsWidget->CaCertpathComboBox->hide();
- ProfileCertOptionsWidget->x509certComboBox->sizeHint();
- ProfileCertOptionsWidget->sizeHint();
+ ProfileCertOptionsWidget->x509certComboBox->tqsizeHint();
+ ProfileCertOptionsWidget->tqsizeHint();
ProfileCertOptionsWidget->UseCiscoCertStoreCheckBox->setChecked(false);
}
ProfileCertOptionsWidget->x509certComboBox->clear();
- for ( QStringList::Iterator ciscoit = CiscoCerts.begin(); ciscoit != CiscoCerts.end(); ++ciscoit )
+ for ( TQStringList::Iterator ciscoit = CiscoCerts.begin(); ciscoit != CiscoCerts.end(); ++ciscoit )
{
- //std::cout << "insert item (cisco certs): " << QString(*ciscoit) << std::endl;
+ //std::cout << "insert item (cisco certs): " << TQString(*ciscoit) << std::endl;
if (GlobalConfig->KvpncDebugLevel > 4)
- GlobalConfig->appendLogEntry(i18n("insert cisco cert:")+" "+QString(*ciscoit),GlobalConfig->debug);
- ProfileCertOptionsWidget->x509certComboBox->insertItem( QString(*ciscoit));
+ GlobalConfig->appendLogEntry(i18n("insert cisco cert:")+" "+TQString(*ciscoit),GlobalConfig->debug);
+ ProfileCertOptionsWidget->x509certComboBox->insertItem( TQString(*ciscoit));
}
if (!it->getX509Certificate().isEmpty())
ProfileCertOptionsWidget->x509certComboBox->setCurrentText( it->getX509Certificate() );
ProfileCertOptionsWidget->x509certURLRequester->setURL( it->getX509Certificate() );
ProfileCertOptionsWidget->CaCertpathComboBox->clear();
- for ( QStringList::Iterator ciscocait = CiscoCaCerts.begin(); ciscocait != CiscoCaCerts.end(); ++ciscocait )
+ for ( TQStringList::Iterator ciscocait = CiscoCaCerts.begin(); ciscocait != CiscoCaCerts.end(); ++ciscocait )
{
- //std::cout << "insert item (cisco certs): " << QString(*ciscocait) << std::endl;
+ //std::cout << "insert item (cisco certs): " << TQString(*ciscocait) << std::endl;
if (GlobalConfig->KvpncDebugLevel > 4)
- GlobalConfig->appendLogEntry(i18n("insert cisco ca cert:")+" "+QString(*ciscocait),GlobalConfig->debug);
- ProfileCertOptionsWidget->CaCertpathComboBox->insertItem( QString(*ciscocait));
+ GlobalConfig->appendLogEntry(i18n("insert cisco ca cert:")+" "+TQString(*ciscocait),GlobalConfig->debug);
+ ProfileCertOptionsWidget->CaCertpathComboBox->insertItem( TQString(*ciscocait));
}
if (!it->getCaCertificate().isEmpty())
ProfileCertOptionsWidget->CaCertpathComboBox->setCurrentText( it->getCaCertificate() );
@@ -2886,7 +2886,7 @@ void PreferencesDialog::profileChanged( const QString& itemtext )
if ( vpnc_version_major ==0 && vpnc_version_minor < 3 )
{
- GlobalConfig->appendLogEntry( i18n( "%1 is too old. Minimum requirement is %2, disabling Xauth interactive option." ).arg( "vpnc" ).arg( "0.3.x" ), GlobalConfig->error );
+ GlobalConfig->appendLogEntry( i18n( "%1 is too old. Minimum requirement is %2, disabling Xauth interactive option." ).tqarg( "vpnc" ).tqarg( "0.3.x" ), GlobalConfig->error );
ProfileCiscoOptionsWidget->UseXauthInteractiveCheckBox->setEnabled( false );
}
@@ -2906,13 +2906,13 @@ void PreferencesDialog::profileChanged( const QString& itemtext )
}
ProfileCiscoOptionsWidget->EnableDpdIdleTimeoutCheckbox->show();
- QWhatsThis::add( ProfileCiscoOptionsWidget->EnableDpdIdleTimeoutCheckbox, i18n( "This enables DPD. Requires vpnc >= 0.5.0." ) );
+ TQWhatsThis::add( ProfileCiscoOptionsWidget->EnableDpdIdleTimeoutCheckbox, i18n( "This enables DPD. Requires vpnc >= 0.5.0." ) );
}
if ( it->getConnectionType() == VpnAccountData::ciscoorig)
{
ProfileCiscoOptionsWidget->EnableDpdIdleTimeoutCheckbox->setChecked(true);
ProfileCiscoOptionsWidget->EnableDpdIdleTimeoutCheckbox->hide();
- QWhatsThis::add( ProfileCiscoOptionsWidget->EnableDpdIdleTimeoutCheckbox, i18n( "This enables DPD." ) );
+ TQWhatsThis::add( ProfileCiscoOptionsWidget->EnableDpdIdleTimeoutCheckbox, i18n( "This enables DPD." ) );
}
ProfileCiscoOptionsWidget->DpdIdleTimeoutSpinbox->setValue(it->getDpdIdleTimeout());
@@ -3198,12 +3198,12 @@ void PreferencesDialog::profileChanged( const QString& itemtext )
ProfileIpsecOptionsWidget->UseCustomIkeCheckBox->setChecked(false);
}
- QStringList IkeList= QStringList::split(",", it->getIpsecIke());
- QStringList EspList= QStringList::split(",", it->getIpsecEsp());
- QString IkeOther="";
- QString EspOther="";
+ TQStringList IkeList= TQStringList::split(",", it->getIpsecIke());
+ TQStringList EspList= TQStringList::split(",", it->getIpsecEsp());
+ TQString IkeOther="";
+ TQString EspOther="";
- for ( QStringList::Iterator ikeit = IkeList.begin(); ikeit != IkeList.end(); ++ikeit )
+ for ( TQStringList::Iterator ikeit = IkeList.begin(); ikeit != IkeList.end(); ++ikeit )
{
std::cout << "ike: " << *ikeit << ":" << std::endl;
@@ -3227,7 +3227,7 @@ void PreferencesDialog::profileChanged( const QString& itemtext )
if (!IkeOther.isEmpty())
ProfileIpsecOptionsWidget->OtherIkeLineEdit->setText(IkeOther);
- for ( QStringList::Iterator espit = EspList.begin(); espit != EspList.end(); ++espit )
+ for ( TQStringList::Iterator espit = EspList.begin(); espit != EspList.end(); ++espit )
{
std::cout << "esp: " << *espit << ":" << std::endl;
@@ -3269,8 +3269,8 @@ void PreferencesDialog::profileChanged( const QString& itemtext )
ProfileNetworkGeneralOptionsWidget->RemoteNetMaskComboBox->setEnabled( true );
ToolInfo *tool = Utils( GlobalConfig ).getToolInfo ( "ipsec" );
- QString realversion = tool->Version.section( ' ', 1, 1 ).section( '/', 0, 0 ).right( tool->Version.section( ' ', 1, 1 ).section( '/', 0, 0 ).length() - 1 );
- QString realtype = tool->Version.section( ' ', 0, 0 ).lower();
+ TQString realversion = tool->Version.section( ' ', 1, 1 ).section( '/', 0, 0 ).right( tool->Version.section( ' ', 1, 1 ).section( '/', 0, 0 ).length() - 1 );
+ TQString realtype = tool->Version.section( ' ', 0, 0 ).lower();
if ( it->getConnectionType() == VpnAccountData::l2tpd_freeswan )
ProfileUserOptionsWidget->setEnabled( true );
@@ -3322,7 +3322,7 @@ void PreferencesDialog::profileChanged( const QString& itemtext )
}
ToolInfo *IpsecToolInfo = Utils ( GlobalConfig ).getToolInfo ( "ipsec" ) ;
- QString IpsecType;
+ TQString IpsecType;
if ( IpsecToolInfo->Version.contains ( "Openswan" ) )
{
ProfileIpsecOptionsWidget->ExchangeModeComboBox->setEnabled(true);
@@ -3353,10 +3353,10 @@ void PreferencesDialog::profileChanged( const QString& itemtext )
// ProfilePskOptionsWidget->setEnabled(true);
if (it->getPskIsInFile())
{
- QFile PskFile(it->getPreSharedKeyFile());
- QString Psk="";
+ TQFile PskFile(it->getPreSharedKeyFile());
+ TQString Psk="";
if (PskFile.exists())
- Psk = QString(PskFile.readAll());
+ Psk = TQString(PskFile.readAll());
ProfilePskOptionsWidget->PSKLineEdit->setText(Psk);
}
else
@@ -3500,10 +3500,10 @@ void PreferencesDialog::profileChanged( const QString& itemtext )
// ProfilePskOptionsWidget->setEnabled(true);
if (it->getPskIsInFile())
{
- QFile PskFile(it->getPreSharedKeyFile());
- QString Psk="";
+ TQFile PskFile(it->getPreSharedKeyFile());
+ TQString Psk="";
if (PskFile.exists())
- Psk = QString(PskFile.readAll());
+ Psk = TQString(PskFile.readAll());
ProfilePskOptionsWidget->PSKLineEdit->setText(Psk);
}
else
@@ -3589,12 +3589,12 @@ void PreferencesDialog::profileChanged( const QString& itemtext )
// ProfileRacoonOptionsWidget->EncryptionAlgorithm2ComboBox->clear();
// ProfileRacoonOptionsWidget->AuthenticationAlgorithm2ComboBox->clear();
//
-// QStringList KernelCrypto = Utils( GlobalConfig ).getKernelCrypto();
+// TQStringList KernelCrypto = Utils( GlobalConfig ).getKernelCrypto();
// // std::cout << "kernel crypto start " << std::endl;
//
-// for ( QStringList::Iterator it = KernelCrypto.begin(); it != KernelCrypto.end(); ++it )
+// for ( TQStringList::Iterator it = KernelCrypto.begin(); it != KernelCrypto.end(); ++it )
// {
-// ProfileRacoonOptionsWidget->EncryptionAlgorithm2ComboBox->insertItem( QString(*it) );
+// ProfileRacoonOptionsWidget->EncryptionAlgorithm2ComboBox->insertItem( TQString(*it) );
// // std::cout << "kernel crypto: " << *it << std::endl;
// }
// //FIXME why this is not in kernel crypto list???
@@ -4262,19 +4262,19 @@ void PreferencesDialog::profileChanged( const QString& itemtext )
ProfileNetworkGeneralOptionsWidget->UseDnsUpdateCheckBox->setChecked( GlobalConfig->currentProfile->getUseDnsUpdate() );
ProfileNetworkRouteOptionsWidget->UseExtraNetworkRoutesCheckbox->setChecked( it->getUseAdditionalNetworkRoutes() );
- QStringList AdditionalNetworkRoutes = it->getAdditionalNetworkRoutes();
+ TQStringList AdditionalNetworkRoutes = it->getAdditionalNetworkRoutes();
// example entry:
// <network>/<netmask>#<gateway>
- for ( QStringList::Iterator it2 = AdditionalNetworkRoutes.begin() ; it2 != AdditionalNetworkRoutes.end(); ++it2 )
+ for ( TQStringList::Iterator it2 = AdditionalNetworkRoutes.begin() ; it2 != AdditionalNetworkRoutes.end(); ++it2 )
{
- QString networkstring = *it2;
- QString Network = networkstring.section( '#', 0, 0 ).section( '/', 0, 0 );
- QString Netmask = networkstring.section( '#', 0, 0 ).section( '/', 1, 1 );
- QString Gateway = networkstring.section( '#', 1, 1 ).section( '/', 0, 0 );
- QString Interface = networkstring.section( '#', 2, 2 );
+ TQString networkstring = *it2;
+ TQString Network = networkstring.section( '#', 0, 0 ).section( '/', 0, 0 );
+ TQString Netmask = networkstring.section( '#', 0, 0 ).section( '/', 1, 1 );
+ TQString Gateway = networkstring.section( '#', 1, 1 ).section( '/', 0, 0 );
+ TQString Interface = networkstring.section( '#', 2, 2 );
- ProfileNetworkRouteOptionsWidget->NetworkListView->insertItem( new QListViewItem( ProfileNetworkRouteOptionsWidget->NetworkListView, Network, Netmask, Gateway, Interface ) );
+ ProfileNetworkRouteOptionsWidget->NetworkListView->insertItem( new TQListViewItem( ProfileNetworkRouteOptionsWidget->NetworkListView, Network, Netmask, Gateway, Interface ) );
ProfileNetworkRouteOptionsWidget->checkList();
@@ -4299,7 +4299,7 @@ void PreferencesDialog::profileChanged( const QString& itemtext )
if (!it->getPkcs11Slot().isEmpty())
ProfileSmartcardOptionsWidget->Pkcs11SlotComboBox->insertItem(it->getPkcs11Slot());
-// QString Pkcs11SlotType = it->getPkcs11SlotType();
+// TQString Pkcs11SlotType = it->getPkcs11SlotType();
// if (Pkcs11SlotType == "id")
// ProfileSmartcardOptionsWidget->Pkcs11SlotTypeComboBox->setCurrentText(i18n("ID"));
// else if (Pkcs11SlotType == "name")
@@ -4310,7 +4310,7 @@ void PreferencesDialog::profileChanged( const QString& itemtext )
ProfileSmartcardOptionsWidget->Pkcs11SlotTypeComboBox->setEnabled(false);
ProfileSmartcardOptionsWidget->Pkcs11SlotTypeLabel->setEnabled(false);
- QString Pkcs11IdType = it->getPkcs11IdType();
+ TQString Pkcs11IdType = it->getPkcs11IdType();
if (Pkcs11IdType == "id")
ProfileSmartcardOptionsWidget->Pkcs11IdTypeComboBox->setCurrentText(i18n("ID"));
else if (Pkcs11IdType == "label")
@@ -4321,7 +4321,7 @@ void PreferencesDialog::profileChanged( const QString& itemtext )
// ProfileSmartcardOptionsWidget->Pkcs11IdTypeComboBox->setCurrentText(i18n("ID"));
// ProfileSmartcardOptionsWidget->Pkcs11IdTypeComboBox->setEnabled(false);
- QString Pkcs11SignMode = it->getPkcs11SignMode();
+ TQString Pkcs11SignMode = it->getPkcs11SignMode();
if (Pkcs11SignMode == "auto")
ProfileSmartcardOptionsWidget->Pkcs11SignModeComboBox->setCurrentText(i18n("auto"));
else if (Pkcs11SignMode == "sign")
@@ -4497,15 +4497,15 @@ void PreferencesDialog::saveSessionClicked()
if ( GlobalConfig->currentProfile == 0 || GlobalConfig->AccountList->isEmpty())
return ;
- GlobalConfig->appPointer->setOverrideCursor( QCursor( Qt::WaitCursor ) );
+ GlobalConfig->appPointer->setOverrideCursor( TQCursor( TQt::WaitCursor ) );
VpnAccountData *profile = GlobalConfig->currentProfile;
- //QString itemString=ConnectionTypeComboBox->currentText();
+ //TQString itemString=ConnectionTypeComboBox->currentText();
int item = ProfileGeneralOptionsWidget->ConnectionTypeComboBox->currentItem() ;
GlobalConfig->currentProfile->setConnectionType( ( VpnAccountData::ConnectionType ) ( item ) );
-// KMessageBox::information(0,"connection type changed: "+QString().setNum(item),QString("type set"));
+// KMessageBox::information(0,"connection type changed: "+TQString().setNum(item),TQString("type set"));
profile->setDescription( ProfileGeneralOptionsWidget->DescriptionLineEdit->text() );
@@ -4664,17 +4664,17 @@ void PreferencesDialog::saveSessionClicked()
}
else
{
- QString addr = ProfileNetworkGeneralOptionsWidget->RemoteNetAddrLineEdit->text();
+ TQString addr = ProfileNetworkGeneralOptionsWidget->RemoteNetAddrLineEdit->text();
int part0 = addr.section( '.', 0, 0 ).toInt();
int part1 = addr.section( '.', 1, 1 ).toInt();
int part2 = addr.section( '.', 2, 2 ).toInt();
int part3 = addr.section( '.', 3, 3 ).toInt();
/*
- LogOutput->append ("part0: "+QString().setNum(part0));
- LogOutput->append ("part1: "+QString().setNum(part1));
- LogOutput->append ("part2: "+QString().setNum(part2));
- LogOutput->append ("part3: "+QString().setNum(part3));
+ LogOutput->append ("part0: "+TQString().setNum(part0));
+ LogOutput->append ("part1: "+TQString().setNum(part1));
+ LogOutput->append ("part2: "+TQString().setNum(part2));
+ LogOutput->append ("part3: "+TQString().setNum(part3));
*/
if ( ( part0 < 1 || part0 > 254 ) || ( part1 < 0 || part1 > 254 ) || ( part2 < 0 || part2 > 254 ) || ( part3 < 0 || part3 > 254 ) )
{
@@ -4745,14 +4745,14 @@ void PreferencesDialog::saveSessionClicked()
{
if (ProfilePskOptionsWidget->CheckSavePsk->isChecked())
{
- QString Psk=ProfilePskOptionsWidget->PSKLineEdit->text();
+ TQString Psk=ProfilePskOptionsWidget->PSKLineEdit->text();
if (ProfilePskOptionsWidget->PskInFileCheckBox->isChecked())
{
- QString PskFileName = ProfilePskOptionsWidget->PSKFileURLRequester->url();
- QFile PskFile (PskFileName);
+ TQString PskFileName = ProfilePskOptionsWidget->PSKFileURLRequester->url();
+ TQFile PskFile (PskFileName);
if (PskFile.open(IO_WriteOnly))
{
- QTextStream stream ( &PskFile );
+ TQTextStream stream ( &PskFile );
stream << Psk;
profile->setPskIsInFile(true);
profile->setSavePsk(true);
@@ -4776,7 +4776,7 @@ void PreferencesDialog::saveSessionClicked()
profile->setUserName(ProfileUserOptionsWidget->UsernameLineEdit->text());
if (ProfileUserOptionsWidget->CheckUserPass->isChecked())
{
- QString UserPassword = ProfileUserOptionsWidget->PasswordEdit->text();
+ TQString UserPassword = ProfileUserOptionsWidget->PasswordEdit->text();
if (!UserPassword.isEmpty())
{
profile->setUserPassword(UserPassword);
@@ -4807,7 +4807,7 @@ void PreferencesDialog::saveSessionClicked()
profile->setUserName(ProfileUserOptionsWidget->UsernameLineEdit->text());
if (ProfileUserOptionsWidget->CheckUserPass->isChecked())
{
- QString UserPassword = ProfileUserOptionsWidget->PasswordEdit->text();
+ TQString UserPassword = ProfileUserOptionsWidget->PasswordEdit->text();
if (!UserPassword.isEmpty())
{
profile->setUserPassword(UserPassword);
@@ -4876,8 +4876,8 @@ void PreferencesDialog::saveSessionClicked()
profile->setSaveUserPassword ( ProfileCertOptionsWidget->SavePrivateKeyPasswordCheckBox->isChecked() );
// ike + esp
- QStringList IkeList;
- QStringList EspList;
+ TQStringList IkeList;
+ TQStringList EspList;
if (ProfileIpsecOptionsWidget->IkeAes256Sha1CheckBox->isChecked())
IkeList.append("aes256-sha1");
@@ -4922,10 +4922,10 @@ void PreferencesDialog::saveSessionClicked()
profile->setIpsecEsp(EspList.join(","));
profile->setIpsecIke(IkeList.join(","));
- for ( QStringList::Iterator ikeit = IkeList.begin(); ikeit != IkeList.end(); ++ikeit )
+ for ( TQStringList::Iterator ikeit = IkeList.begin(); ikeit != IkeList.end(); ++ikeit )
std::cout << "ike: " << *ikeit << ":" << std::endl;
- for ( QStringList::Iterator espit = EspList.begin(); espit != EspList.end(); ++espit )
+ for ( TQStringList::Iterator espit = EspList.begin(); espit != EspList.end(); ++espit )
std::cout << "esp: " << *espit << ":" << std::endl;
if(ProfileIpsecOptionsWidget->UseCustomEspCheckBox->isChecked() && !EspList.isEmpty())
@@ -4973,14 +4973,14 @@ void PreferencesDialog::saveSessionClicked()
{
if (ProfilePskOptionsWidget->CheckSavePsk->isChecked())
{
- QString Psk=ProfilePskOptionsWidget->PSKLineEdit->text();
+ TQString Psk=ProfilePskOptionsWidget->PSKLineEdit->text();
if (ProfilePskOptionsWidget->PskInFileCheckBox->isChecked())
{
- QString PskFileName = ProfilePskOptionsWidget->PSKFileURLRequester->url();
- QFile PskFile (PskFileName);
+ TQString PskFileName = ProfilePskOptionsWidget->PSKFileURLRequester->url();
+ TQFile PskFile (PskFileName);
if (PskFile.open(IO_WriteOnly))
{
- QTextStream stream ( &PskFile );
+ TQTextStream stream ( &PskFile );
stream << Psk;
profile->setPskIsInFile(true);
profile->setSavePsk(true);
@@ -5004,7 +5004,7 @@ void PreferencesDialog::saveSessionClicked()
profile->setUserName(ProfileUserOptionsWidget->UsernameLineEdit->text());
if (ProfileUserOptionsWidget->CheckUserPass->isChecked())
{
- QString UserPassword = ProfileUserOptionsWidget->PasswordEdit->text();
+ TQString UserPassword = ProfileUserOptionsWidget->PasswordEdit->text();
if (!UserPassword.isEmpty())
{
profile->setUserPassword(UserPassword);
@@ -5247,17 +5247,17 @@ void PreferencesDialog::saveSessionClicked()
}
else
{
- QString addr = ProfileNetworkGeneralOptionsWidget->RemoteNetAddrLineEdit->text();
+ TQString addr = ProfileNetworkGeneralOptionsWidget->RemoteNetAddrLineEdit->text();
int part0 = addr.section( '.', 0, 0 ).toInt();
int part1 = addr.section( '.', 1, 1 ).toInt();
int part2 = addr.section( '.', 2, 2 ).toInt();
int part3 = addr.section( '.', 3, 3 ).toInt();
/*
- LogOutput->append ("part0: "+QString().setNum(part0));
- LogOutput->append ("part1: "+QString().setNum(part1));
- LogOutput->append ("part2: "+QString().setNum(part2));
- LogOutput->append ("part3: "+QString().setNum(part3));
+ LogOutput->append ("part0: "+TQString().setNum(part0));
+ LogOutput->append ("part1: "+TQString().setNum(part1));
+ LogOutput->append ("part2: "+TQString().setNum(part2));
+ LogOutput->append ("part3: "+TQString().setNum(part3));
*/
if ( ( part0 < 1 || part0 > 254 ) || ( part1 < 0 || part1 > 254 ) || ( part2 < 0 || part2 > 254 ) || ( part3 < 0 || part3 > 254 ) )
@@ -5335,7 +5335,7 @@ void PreferencesDialog::saveSessionClicked()
bool IPOk=true;
if ( ProfileNetworkVirtualIpOptionsWidget->UseVirtualIPCheckBox->isChecked())
{
- QString LocalVirtualIp = ProfileNetworkVirtualIpOptionsWidget->LocalVirtualIpEdit->text();
+ TQString LocalVirtualIp = ProfileNetworkVirtualIpOptionsWidget->LocalVirtualIpEdit->text();
if (Utils( GlobalConfig ).isValidIPv4Address (LocalVirtualIp) == false)
{
KMessageBox::error ( this, i18n( "No valid IP address entered!" ), i18n( "No Valid IP Address" ) );
@@ -5346,7 +5346,7 @@ void PreferencesDialog::saveSessionClicked()
profile->setLocalVirtualIP( LocalVirtualIp);
}
- QString RemoteVirtualIp = ProfileNetworkVirtualIpOptionsWidget->RemoteVirtualIpLineEdit->text();
+ TQString RemoteVirtualIp = ProfileNetworkVirtualIpOptionsWidget->RemoteVirtualIpLineEdit->text();
if (Utils( GlobalConfig ).isValidIPv4Address(RemoteVirtualIp) == false)
{
KMessageBox::error ( this, i18n( "No valid IP address entered!" ), i18n( "No Valid IP Address" ) );
@@ -5378,17 +5378,17 @@ void PreferencesDialog::saveSessionClicked()
}
else
{
- QString addr = ProfileNetworkGeneralOptionsWidget->PingIPLineEdit->text();
+ TQString addr = ProfileNetworkGeneralOptionsWidget->PingIPLineEdit->text();
// int part0 = addr.section( '.', 0, 0 ).toInt();
// int part1 = addr.section( '.', 1, 1 ).toInt();
// int part2 = addr.section( '.', 2, 2 ).toInt();
// int part3 = addr.section( '.', 3, 3 ).toInt();
/*
- LogOutput->append ("part0: "+QString().setNum(part0));
- LogOutput->append ("part1: "+QString().setNum(part1));
- LogOutput->append ("part2: "+QString().setNum(part2));
- LogOutput->append ("part3: "+QString().setNum(part3));
+ LogOutput->append ("part0: "+TQString().setNum(part0));
+ LogOutput->append ("part1: "+TQString().setNum(part1));
+ LogOutput->append ("part2: "+TQString().setNum(part2));
+ LogOutput->append ("part3: "+TQString().setNum(part3));
*/
// if ( ( part0 < 1 || part0 > 254 ) || ( part1 < 0 || part1 > 254 ) || ( part2 < 0 || part2 > 254 ) || ( part3 < 0 || part3 > 254 ) )
// {
@@ -5403,7 +5403,7 @@ void PreferencesDialog::saveSessionClicked()
bool IPOk=true;
if (ProfileNetworkVirtualIpOptionsWidget->UseVirtualIPCheckBox->isChecked())
{
- QString LocalVirtualIp = ProfileNetworkVirtualIpOptionsWidget->LocalVirtualIpEdit->text();
+ TQString LocalVirtualIp = ProfileNetworkVirtualIpOptionsWidget->LocalVirtualIpEdit->text();
if (Utils( GlobalConfig ).isValidIPv4Address (LocalVirtualIp) == false)
{
KMessageBox::error ( this, i18n( "No valid IP address entered!" ), i18n( "No Valid IP Address" ) );
@@ -5414,7 +5414,7 @@ void PreferencesDialog::saveSessionClicked()
profile->setLocalVirtualIP( LocalVirtualIp);
}
- QString RemoteVirtualIp = ProfileNetworkVirtualIpOptionsWidget->RemoteVirtualIpLineEdit->text();
+ TQString RemoteVirtualIp = ProfileNetworkVirtualIpOptionsWidget->RemoteVirtualIpLineEdit->text();
if (ProfileNetworkGeneralOptionsWidget->TunnelDeviceTypeComboBox->currentText().lower() == "tun")
{
@@ -5589,7 +5589,7 @@ void PreferencesDialog::saveSessionClicked()
bool IPOk=true;
if (ProfileNetworkVirtualIpOptionsWidget->UseVirtualIPCheckBox->isChecked())
{
- QString LocalVirtualIp = ProfileNetworkVirtualIpOptionsWidget->LocalVirtualIpEdit->text();
+ TQString LocalVirtualIp = ProfileNetworkVirtualIpOptionsWidget->LocalVirtualIpEdit->text();
if (Utils( GlobalConfig ).isValidIPv4Address (LocalVirtualIp) == false)
{
KMessageBox::error ( this, i18n( "No valid IP address entered!" ), i18n( "No Valid IP Address" ) );
@@ -5600,7 +5600,7 @@ void PreferencesDialog::saveSessionClicked()
profile->setLocalVirtualIP( LocalVirtualIp);
}
- QString RemoteVirtualIp = ProfileNetworkVirtualIpOptionsWidget->RemoteVirtualIpLineEdit->text();
+ TQString RemoteVirtualIp = ProfileNetworkVirtualIpOptionsWidget->RemoteVirtualIpLineEdit->text();
if (ProfileNetworkGeneralOptionsWidget->TunnelDeviceTypeComboBox->currentText().lower() == "tun")
{
@@ -5642,7 +5642,7 @@ void PreferencesDialog::saveSessionClicked()
if (ProfileNetworkVirtualIpOptionsWidget->UseVirtualIPCheckBox->isChecked())
{
- QString LocalVirtualIp = ProfileNetworkVirtualIpOptionsWidget->LocalVirtualIpEdit->text();
+ TQString LocalVirtualIp = ProfileNetworkVirtualIpOptionsWidget->LocalVirtualIpEdit->text();
if (Utils( GlobalConfig ).isValidIPv4Address (LocalVirtualIp) == false)
{
KMessageBox::error ( this, i18n( "No valid IP address entered!" ), i18n( "No Valid IP Address" ) );
@@ -5654,7 +5654,7 @@ void PreferencesDialog::saveSessionClicked()
}
- QString RemoteVirtualIp = ProfileNetworkVirtualIpOptionsWidget->RemoteVirtualIpLineEdit->text();
+ TQString RemoteVirtualIp = ProfileNetworkVirtualIpOptionsWidget->RemoteVirtualIpLineEdit->text();
if (ProfileNetworkGeneralOptionsWidget->TunnelDeviceTypeComboBox->currentText().lower() == "tun")
{
@@ -5714,7 +5714,7 @@ void PreferencesDialog::saveSessionClicked()
if (ProfileSshOptionsWidget->UseSshConfigRemoteScriptCheckBox->isChecked() && ProfileSshOptionsWidget->SshConfigRemoteScriptLineEdit->text().isEmpty())
{
- KMessageBox::error ( this, i18n( "%1 cant be empty!" ).arg(i18n("ssh config remote script")), i18n( "%1 empty" ).arg(i18n("ssh config remote script")) );
+ KMessageBox::error ( this, i18n( "%1 cant be empty!" ).tqarg(i18n("ssh config remote script")), i18n( "%1 empty" ).tqarg(i18n("ssh config remote script")) );
IPOk=false;
}
@@ -5727,7 +5727,7 @@ void PreferencesDialog::saveSessionClicked()
}
else
{
- if ( ProfileNetworkGeneralOptionsWidget->PingCheckBox->isChecked() && ProfileNetworkGeneralOptionsWidget->PingIPLineEdit->text() == QString( "" ) )
+ if ( ProfileNetworkGeneralOptionsWidget->PingCheckBox->isChecked() && ProfileNetworkGeneralOptionsWidget->PingIPLineEdit->text() == TQString( "" ) )
{
KMessageBox::error ( this, i18n( "No hostname/IP address (ping host) entered!" ), i18n( "No hostname/IP address" ) );
GlobalConfig->appendLogEntry( i18n( "No hostname/IP address (ping host) entered!" ) , GlobalConfig->error );
@@ -5878,7 +5878,7 @@ void PreferencesDialog::saveSessionClicked()
}
- QStringList AdditionalNetworkRoutes;
+ TQStringList AdditionalNetworkRoutes;
if ( ProfileNetworkRouteOptionsWidget->UseExtraNetworkRoutesCheckbox->isChecked() )
profile->setUseAdditionalNetworkRoutes( true );
else
@@ -5886,12 +5886,12 @@ void PreferencesDialog::saveSessionClicked()
if (ProfileNetworkRouteOptionsWidget->NetworkListView->childCount() > 0)
{
- QListViewItemIterator it( ProfileNetworkRouteOptionsWidget->NetworkListView );
+ TQListViewItemIterator it( ProfileNetworkRouteOptionsWidget->NetworkListView );
for ( ; it.current(); ++it )
{
// example entry:
// <network>/<netmask>#<gateway>
- QString network = QString( it.current() ->text( 0 ) + "/" + it.current() ->text( 1 ) );
+ TQString network = TQString( it.current() ->text( 0 ) + "/" + it.current() ->text( 1 ) );
network.append( "#" );
network.append( it.current() ->text( 2 ) ); // gateway
network.append( "#" );
@@ -5938,7 +5938,7 @@ void PreferencesDialog::saveSessionClicked()
// GlobalConfig->appendLogEntry( i18n( "ID for certificate at smartcard can't be empty!" ) ,GlobalConfig->error);
canAccept = false;
}
- QString Pkcs11SlotType = ProfileSmartcardOptionsWidget->Pkcs11SlotTypeComboBox->currentText();
+ TQString Pkcs11SlotType = ProfileSmartcardOptionsWidget->Pkcs11SlotTypeComboBox->currentText();
if (Pkcs11SlotType == i18n("ID"))
profile->setPkcs11SlotType("id");
else if (Pkcs11SlotType == i18n("Name"))
@@ -5946,7 +5946,7 @@ void PreferencesDialog::saveSessionClicked()
else
profile->setPkcs11SlotType("label");
- QString Pkcs11IdType = ProfileSmartcardOptionsWidget->Pkcs11IdTypeComboBox->currentText();
+ TQString Pkcs11IdType = ProfileSmartcardOptionsWidget->Pkcs11IdTypeComboBox->currentText();
if (Pkcs11IdType == i18n("ID"))
profile->setPkcs11IdType("id");
else if (Pkcs11IdType == i18n("Label"))
@@ -5954,7 +5954,7 @@ void PreferencesDialog::saveSessionClicked()
else
profile->setPkcs11IdType("subject");
- QString Pkcs11SignMode = ProfileSmartcardOptionsWidget->Pkcs11SignModeComboBox->currentText();
+ TQString Pkcs11SignMode = ProfileSmartcardOptionsWidget->Pkcs11SignModeComboBox->currentText();
if (Pkcs11SignMode == i18n("auto"))
profile->setPkcs11SignMode("auto");
else if (Pkcs11SignMode == i18n("sign"))
@@ -5996,20 +5996,20 @@ void PreferencesDialog::saveSessionClicked()
GlobalConfig->config->sync();
GlobalConfig->appPointer->restoreOverrideCursor();
- //GlobalConfig->appendLogEntry( i18n( "Profile \"%1\" saved." ).arg( newName ),GlobalConfig->debug);
+ //GlobalConfig->appendLogEntry( i18n( "Profile \"%1\" saved." ).tqarg( newName ),GlobalConfig->debug);
// enableButtonApply(false);
}
void PreferencesDialog::deleteSessionClicked()
{
- QString Name = ProfileGeneralSelector->currentText();
+ TQString Name = ProfileGeneralSelector->currentText();
ToolInfo *IpsecToolInfo = Utils ( GlobalConfig ).getToolInfo ( "ipsec" ) ;
- QString IpsecType;
+ TQString IpsecType;
- QString TypeString = i18n ( "unknown" );
+ TQString TypeString = i18n ( "unknown" );
if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::cisco )
TypeString = i18n("Cisco");
else if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::ciscoorig )
@@ -6049,8 +6049,8 @@ void PreferencesDialog::deleteSessionClicked()
if ( !ProfileGeneralSelector->currentText().isEmpty() )
{
- int result = KMessageBox::questionYesNo ( this, i18n ( "Really delete profile \"%1\" (type: %2, Server: %3)?" ).arg ( GlobalConfig->currentProfile->getName() ).arg(TypeString).arg(GlobalConfig->currentProfile->getGateway()), i18n ( "Delete?" ), KStdGuiItem::del(), KStdGuiItem::cancel() );
- //LogOutput->append( "Result: "+ QString().setNum(result) ) ;
+ int result = KMessageBox::questionYesNo ( this, i18n ( "Really delete profile \"%1\" (type: %2, Server: %3)?" ).arg ( GlobalConfig->currentProfile->getName() ).tqarg(TypeString).tqarg(GlobalConfig->currentProfile->getGateway()), i18n ( "Delete?" ), KStdGuiItem::del(), KStdGuiItem::cancel() );
+ //LogOutput->append( "Result: "+ TQString().setNum(result) ) ;
if ( result == 3 ) // Yes
{
VpnAccountData * it;
@@ -6122,12 +6122,12 @@ void PreferencesDialog::deleteSessionClicked()
// CommandExecutionGroupBox->setEnabled( false );
}
- // slotStatusMsg ( i18n( "Profile \"%1\" deleted." ).arg( Name ), ID_FLASH_MSG );
+ // slotStatusMsg ( i18n( "Profile \"%1\" deleted." ).tqarg( Name ), ID_FLASH_MSG );
profileAddedOrDeleted = true;
saveSessionClicked();
GlobalConfig->removeEntry( Name );
- GlobalConfig->appendLogEntry ( i18n( "Profile \"%1\" deleted." ).arg( Name ), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( i18n( "Profile \"%1\" deleted." ).tqarg( Name ), GlobalConfig->debug );
//saveOptions(); // TODO save, currently after closing dialog
@@ -6151,19 +6151,19 @@ void PreferencesDialog::newSessionClicked()
VpnAccountData * it;
bool nameOk = false;
bool ok;
- QString newName=newdlg.getName();
- QString Oldname = newdlg.getName();
+ TQString newName=newdlg.getName();
+ TQString Oldname = newdlg.getName();
while ( nameOk == false )
{
for ( it = GlobalConfig->AccountList->first(); it; it = GlobalConfig->AccountList->next() )
{
if ( ( it != GlobalConfig->currentProfile ) && ( it->getName() == newName ) )
{
- //account->setName( QString( account->getName() + "_2" ) );
- // KMessageBox::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).arg( account->getName() ), i18n( "Name exist, renamed" ) );
+ //account->setName( TQString( account->getName() + "_2" ) );
+ // KMessageBox::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).tqarg( account->getName() ), i18n( "Name exist, renamed" ) );
KMessageBox::error ( this, i18n ( "Profile name exists!" ), i18n ( "Name Exists" ) );
- newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), QString ( Oldname + "_2" ), &ok );
+ newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), TQString ( Oldname + "_2" ), &ok );
if ( ok == false )
{
KMessageBox::information ( 0, i18n ( "Rename at new created profile was canceled." ) );
@@ -6190,7 +6190,7 @@ void PreferencesDialog::newSessionClicked()
if ( it->getName() == newName )
{
if (GlobalConfig->KvpncDebugLevel > 3)
- GlobalConfig->appendLogEntry ( i18n( "New created profile \"%1\" found in profile list." ).arg( newName ), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( i18n( "New created profile \"%1\" found in profile list." ).tqarg( newName ), GlobalConfig->debug );
profileAddedOrDeleted=true;
ProfileGeneralSelector->insertItem( newName );
ProfileNetworkRouteSelector->insertItem( newName );
@@ -6230,10 +6230,10 @@ void PreferencesDialog::newSessionClicked()
// GeneralGroupbox->setEnabled( true );
// CommandExecutionGroupBox->setEnabled( true );
- KMessageBox::information ( this, i18n( "Profile \"%1\" added.\nNow set the right type,\n fill in the fields\nand press \"Save\" to complete the profile." ).arg( newName ), i18n( "Complete Profile" ) );
- //slotStatusMsg ( i18n( "Profile \"%1\" added." ).arg( Name ), ID_FLASH_MSG );
+ KMessageBox::information ( this, i18n( "Profile \"%1\" added.\nNow set the right type,\n fill in the fields\nand press \"Save\" to complete the profile." ).tqarg( newName ), i18n( "Complete Profile" ) );
+ //slotStatusMsg ( i18n( "Profile \"%1\" added." ).tqarg( Name ), ID_FLASH_MSG );
- GlobalConfig->appendLogEntry ( i18n( "Profile \"%1\" added." ).arg( newName ), GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( i18n( "Profile \"%1\" added." ).tqarg( newName ), GlobalConfig->debug );
profileAddedOrDeleted = true;
configChanged=true;
NewProfileName = newName;
@@ -6261,12 +6261,12 @@ void PreferencesDialog::renameSessionClicked()
{
bool ok = true;
bool nameOk = false;
- QString oldName = GlobalConfig->currentProfile->getName();
- QString *newName;
+ TQString oldName = GlobalConfig->currentProfile->getName();
+ TQString *newName;
while ( nameOk == false )
{
- newName = new QString( KInputDialog::getText ( i18n( "New Name" ), i18n( "Enter new name for profile:" ), oldName, &ok, this ) );
+ newName = new TQString( KInputDialog::getText ( i18n( "New Name" ), i18n( "Enter new name for profile:" ), oldName, &ok, this ) );
if ( newName->contains( ' ' ) )
{
KMessageBox::error ( this, i18n( "Blanks are not allowed in profile names!" ), i18n( "Illegal Character in Name" ) );
@@ -6352,13 +6352,13 @@ void PreferencesDialog::renameSessionClicked()
profileAddedOrDeleted = true;
configChanged=true;
- GlobalConfig->lastProfile = QString(*newName);
+ GlobalConfig->lastProfile = TQString(*newName);
saveSessionClicked();
GlobalConfig->removeEntry( oldName );
- KMessageBox::information ( 0, i18n ( "Rename of \"%1\" to \"%2\" was successful." ).arg ( oldName ).arg(GlobalConfig->currentProfile->getName()) );
- GlobalConfig->appendLogEntry ( i18n ( "Rename of \"%1\" to \"%2\" was successful." ).arg ( oldName ).arg(GlobalConfig->currentProfile->getName()), GlobalConfig->info );
+ KMessageBox::information ( 0, i18n ( "Rename of \"%1\" to \"%2\" was successful." ).arg ( oldName ).tqarg(GlobalConfig->currentProfile->getName()) );
+ GlobalConfig->appendLogEntry ( i18n ( "Rename of \"%1\" to \"%2\" was successful." ).arg ( oldName ).tqarg(GlobalConfig->currentProfile->getName()), GlobalConfig->info );
}
@@ -6372,7 +6372,7 @@ void PreferencesDialog::importCertificate()
dlg.exec();
}
-void PreferencesDialog::pageChanged( QWidget* page )
+void PreferencesDialog::pageChanged( TQWidget* page )
{
// std::cout << "page changed, new profile: "<< lastProfileName << std::endl;
@@ -6554,7 +6554,7 @@ void PreferencesDialog::useUdpToggled( bool )
}
}
-void PreferencesDialog::OpenvpnPathChanged( const QString& )
+void PreferencesDialog::OpenvpnPathChanged( const TQString& )
{
ToolInfo * OpenvpnInfo = Utils( GlobalConfig ).getToolInfo ( "openvpn" );
// OpenvpnInfo->PathToExec = ConfigDaemonOptionsWidget->OpenvpnPathInput->url();
@@ -6571,7 +6571,7 @@ void PreferencesDialog::OpenvpnPathChanged( const QString& )
ConfigDaemonOptionsWidget->OpenvpnStatePixmapLabel->setPixmap( wrong_icon );
}
-void PreferencesDialog::FreeswanPathChanged( const QString& )
+void PreferencesDialog::FreeswanPathChanged( const TQString& )
{
// KMessageBox::information(0,"path changed","ipsec");
@@ -6591,7 +6591,7 @@ void PreferencesDialog::FreeswanPathChanged( const QString& )
ConfigDaemonOptionsWidget->IpsecStatePixmapLabel->setPixmap( wrong_icon );
}
-void PreferencesDialog::PppdPathChanged( const QString& )
+void PreferencesDialog::PppdPathChanged( const TQString& )
{
// KMessageBox::information(0,"path changed","Pppd");
@@ -6611,7 +6611,7 @@ void PreferencesDialog::PppdPathChanged( const QString& )
ConfigDaemonOptionsWidget->PppdStatePixmapLabel->setPixmap( wrong_icon );
}
-void PreferencesDialog::PptpPathChanged( const QString& )
+void PreferencesDialog::PptpPathChanged( const TQString& )
{
// KMessageBox::information(0,"path changed","Pptp");
@@ -6631,7 +6631,7 @@ void PreferencesDialog::PptpPathChanged( const QString& )
ConfigDaemonOptionsWidget->PptpStatePixmapLabel->setPixmap( wrong_icon );
}
-void PreferencesDialog::RacoonPathChanged( const QString& )
+void PreferencesDialog::RacoonPathChanged( const TQString& )
{
// KMessageBox::information(0,"path changed","Racoon");
@@ -6645,8 +6645,8 @@ void PreferencesDialog::RacoonPathChanged( const QString& )
ConfigDaemonOptionsWidget->RacoonVersionLineEdit->setText( RacoonInfo->Version );
- QPixmap ok_icon = KGlobal::iconLoader() ->loadIcon( "button_ok", KIcon::NoGroup );
- QPixmap wrong_icon = KGlobal::iconLoader() ->loadIcon( "button_cancel", KIcon::NoGroup );
+ TQPixmap ok_icon = KGlobal::iconLoader() ->loadIcon( "button_ok", KIcon::NoGroup );
+ TQPixmap wrong_icon = KGlobal::iconLoader() ->loadIcon( "button_cancel", KIcon::NoGroup );
if ( RacoonInfo->found )
ConfigDaemonOptionsWidget->RacoonStatePixmapLabel->setPixmap( ok_icon );
@@ -6654,7 +6654,7 @@ void PreferencesDialog::RacoonPathChanged( const QString& )
ConfigDaemonOptionsWidget->RacoonStatePixmapLabel->setPixmap( wrong_icon );
}
-void PreferencesDialog::VpncPathChanged( const QString& )
+void PreferencesDialog::VpncPathChanged( const TQString& )
{
// KMessageBox::information(0,"path changed","Vpnc");
@@ -6678,7 +6678,7 @@ void PreferencesDialog::VpncPathChanged( const QString& )
ConfigDaemonOptionsWidget->VpncStatePixmapLabel->setPixmap( wrong_icon );
}
-void PreferencesDialog::CiscoVpncPathChanged( const QString& )
+void PreferencesDialog::CiscoVpncPathChanged( const TQString& )
{
// KMessageBox::information(0,"path changed","Vpnc");
@@ -6702,7 +6702,7 @@ void PreferencesDialog::CiscoVpncPathChanged( const QString& )
ConfigDaemonOptionsWidget->CiscoVpncStatePixmapLabel->setPixmap( wrong_icon );
}
-void PreferencesDialog::L2tpdPathChanged( const QString& )
+void PreferencesDialog::L2tpdPathChanged( const TQString& )
{
// KMessageBox::information(0,"path changed","L2tpd");
@@ -6727,7 +6727,7 @@ void PreferencesDialog::L2tpdPathChanged( const QString& )
ConfigDaemonOptionsWidget->L2tpdStatePixmapLabel->setPixmap( wrong_icon );
}
-void PreferencesDialog::Xl2tpdPathChanged( const QString& )
+void PreferencesDialog::Xl2tpdPathChanged( const TQString& )
{
// KMessageBox::information(0,"path changed","Xl2tpd");
@@ -6752,7 +6752,7 @@ void PreferencesDialog::Xl2tpdPathChanged( const QString& )
ConfigDaemonOptionsWidget->Xl2tpdStatePixmapLabel->setPixmap( wrong_icon );
}
-void PreferencesDialog::Openl2tpPathChanged( const QString& )
+void PreferencesDialog::Openl2tpPathChanged( const TQString& )
{
// KMessageBox::information(0,"path changed","Openl2tp");
@@ -6777,7 +6777,7 @@ void PreferencesDialog::Openl2tpPathChanged( const QString& )
ConfigDaemonOptionsWidget->Openl2tpStatePixmapLabel->setPixmap( wrong_icon );
}
-void PreferencesDialog::VtundPathChanged( const QString& )
+void PreferencesDialog::VtundPathChanged( const TQString& )
{
// KMessageBox::information(0,"path changed","vtund");
@@ -6802,7 +6802,7 @@ void PreferencesDialog::VtundPathChanged( const QString& )
ConfigDaemonOptionsWidget->VtundStatePixmapLabel->setPixmap( wrong_icon );
}
-void PreferencesDialog::SshPathChanged( const QString& )
+void PreferencesDialog::SshPathChanged( const TQString& )
{
// KMessageBox::information(0,"path changed","ssh");
@@ -6827,11 +6827,11 @@ void PreferencesDialog::SshPathChanged( const QString& )
ConfigDaemonOptionsWidget->SshStatePixmapLabel->setPixmap( wrong_icon );
}
-void PreferencesDialog::showEvent(QShowEvent* e)
+void PreferencesDialog::showEvent(TQShowEvent* e)
{
KDialogBase::showEvent(e);
- QSplitter* splitter = ((QSplitter*)child(0, "QSplitter", true));
+ TQSplitter* splitter = ((TQSplitter*)child(0, TQSPLITTER_OBJECT_NAME_STRING, true));
KListView* listView = ((KListView*)child(0, "KListView", true));
if (splitter && listView)
@@ -6843,8 +6843,8 @@ void PreferencesDialog::showEvent(QShowEvent* e)
{
int shiftSplitterBy = content - visible;
resize(width()+shiftSplitterBy, height());
- QValueList<int> oldSizes = splitter->sizes();
- QValueList<int> newSizes;
+ TQValueList<int> oldSizes = splitter->sizes();
+ TQValueList<int> newSizes;
newSizes << oldSizes[0] + shiftSplitterBy << oldSizes[1] - shiftSplitterBy;
splitter->setSizes(newSizes);
}
@@ -6853,69 +6853,69 @@ void PreferencesDialog::showEvent(QShowEvent* e)
void PreferencesDialog::detectPkcs11Ids()
{
- GlobalConfig->appPointer->setOverrideCursor( QCursor(Qt::WaitCursor) );
+ GlobalConfig->appPointer->setOverrideCursor( TQCursor(TQt::WaitCursor) );
ProfileSmartcardOptionsWidget->Pkcs11IdComboBox->clear();
int Pkcs11IdType = ProfileSmartcardOptionsWidget->Pkcs11IdTypeComboBox->currentItem();
- QString Pkcs11IdTypeTmp;
+ TQString Pkcs11IdTypeTmp;
if (Pkcs11IdType == 0)
{
Pkcs11IdTypeTmp="id";
if (KvpncDebugLevel > 1)
- GlobalConfig->appendLogEntry(i18n("Pkcs11IdType: %1").arg(Pkcs11IdTypeTmp),KVpncConfig::debug);
+ GlobalConfig->appendLogEntry(i18n("Pkcs11IdType: %1").tqarg(Pkcs11IdTypeTmp),KVpncConfig::debug);
}
else if (Pkcs11IdType == 1)
{
Pkcs11IdTypeTmp="label";
if (KvpncDebugLevel > 1)
- GlobalConfig->appendLogEntry(i18n("Pkcs11IdType: %1").arg(Pkcs11IdTypeTmp),KVpncConfig::debug);
+ GlobalConfig->appendLogEntry(i18n("Pkcs11IdType: %1").tqarg(Pkcs11IdTypeTmp),KVpncConfig::debug);
}
else
{
Pkcs11IdTypeTmp="subject";
if (KvpncDebugLevel > 1)
- GlobalConfig->appendLogEntry(i18n("Pkcs11IdType: %1").arg(Pkcs11IdTypeTmp),KVpncConfig::debug);
+ GlobalConfig->appendLogEntry(i18n("Pkcs11IdType: %1").tqarg(Pkcs11IdTypeTmp),KVpncConfig::debug);
}
- QString ProviderLib="";
+ TQString ProviderLib="";
bool isOpenvpn = GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::openvpn;
if (ProfileSmartcardOptionsWidget->UsePkcs11ProvidersCheckBox->isChecked() && !ProfileSmartcardOptionsWidget->Pkcs11ProvidersURLRequester->url().isEmpty())
ProviderLib = ProfileSmartcardOptionsWidget->Pkcs11ProvidersURLRequester->url();
// we have to split slot id and name ("0 : foobar") => 0
- QString Pkcs11Slot = ProfileSmartcardOptionsWidget->Pkcs11SlotComboBox->currentText().section(':',0,0).stripWhiteSpace();
+ TQString Pkcs11Slot = ProfileSmartcardOptionsWidget->Pkcs11SlotComboBox->currentText().section(':',0,0).stripWhiteSpace();
- QStringList Pkcs11Ids;
+ TQStringList Pkcs11Ids;
if (isOpenvpn)
Pkcs11Ids = Utils(GlobalConfig).getOpenvpnPkcs11Ids(ProviderLib);
else
Pkcs11Ids = Utils(GlobalConfig).getSmartcardCertsFromSlot(Pkcs11Slot,Pkcs11IdTypeTmp, ProviderLib );
- for ( QStringList::Iterator it = Pkcs11Ids.begin(); it != Pkcs11Ids.end(); ++it )
- ProfileSmartcardOptionsWidget->Pkcs11IdComboBox->insertItem( QString(*it));
+ for ( TQStringList::Iterator it = Pkcs11Ids.begin(); it != Pkcs11Ids.end(); ++it )
+ ProfileSmartcardOptionsWidget->Pkcs11IdComboBox->insertItem( TQString(*it));
GlobalConfig->appPointer->restoreOverrideCursor();
}
void PreferencesDialog::detectPkcs11Slots()
{
- GlobalConfig->appPointer->setOverrideCursor( QCursor(Qt::WaitCursor) );
+ GlobalConfig->appPointer->setOverrideCursor( TQCursor(TQt::WaitCursor) );
ProfileSmartcardOptionsWidget->Pkcs11SlotComboBox->clear();
- QString ProviderLib="";
+ TQString ProviderLib="";
bool isOpenvpn = GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::openvpn;
if (ProfileSmartcardOptionsWidget->UsePkcs11ProvidersCheckBox->isChecked() && !ProfileSmartcardOptionsWidget->Pkcs11ProvidersURLRequester->url().isEmpty())
ProviderLib = ProfileSmartcardOptionsWidget->Pkcs11ProvidersURLRequester->url();
- QStringList Pkcs11Slots;
+ TQStringList Pkcs11Slots;
if (isOpenvpn)
Pkcs11Slots.append("0");
else
Pkcs11Slots = Utils(GlobalConfig).getSmartcardSlots(ProviderLib);
- for ( QStringList::Iterator it = Pkcs11Slots.begin(); it != Pkcs11Slots.end(); ++it )
- ProfileSmartcardOptionsWidget->Pkcs11SlotComboBox->insertItem( QString(*it));
+ for ( TQStringList::Iterator it = Pkcs11Slots.begin(); it != Pkcs11Slots.end(); ++it )
+ ProfileSmartcardOptionsWidget->Pkcs11SlotComboBox->insertItem( TQString(*it));
GlobalConfig->appPointer->restoreOverrideCursor();
}
@@ -6989,7 +6989,7 @@ if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::racoo
void PreferencesDialog::singleDesToggled(bool)
{}
-void PreferencesDialog::tunnelDeviceTypeChanged(const QString & string )
+void PreferencesDialog::tunnelDeviceTypeChanged(const TQString & string )
{
if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::openvpn || GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::ssh)
{
@@ -7004,7 +7004,7 @@ void PreferencesDialog::tunnelDeviceTypeChanged(const QString & string )
}
}
-void PreferencesDialog::natModeToggled( const QString &)
+void PreferencesDialog::natModeToggled( const TQString &)
{
if (ProfileCiscoOptionsWidget->CiscoNatModeComboBox->currentText() == "none")
{
@@ -7022,7 +7022,7 @@ void PreferencesDialog::useKwalletToggled(bool)
{
int result = KMessageBox::questionYesNo ( this, i18n ( "Do you really want disable the use of KWallet? KVpnc will save passwords and psk in config file if requested." ), i18n ( "Disable KWallet?" ) );
- //LogOutput->append( "Result: "+ QString().setNum(result) ) ;
+ //LogOutput->append( "Result: "+ TQString().setNum(result) ) ;
if ( result == 2 || result == 4 ) // No or Cancel
{
GeneralOptionsWidget->useKwalletCheckBox->setChecked(true);
@@ -7071,7 +7071,7 @@ void PreferencesDialog::useCiscoCertStoreToggled(bool)
ProfileCertOptionsWidget->CaCertpathComboBox->show();
ProfileCertOptionsWidget->CaCertpathURLRequester->hide();
ProfileCertOptionsWidget->certpathURLRequester->hide();
- ProfileCertOptionsWidget->sizeHint();
+ ProfileCertOptionsWidget->tqsizeHint();
}
else
{
@@ -7080,7 +7080,7 @@ void PreferencesDialog::useCiscoCertStoreToggled(bool)
ProfileCertOptionsWidget->CaCertpathComboBox->hide();
ProfileCertOptionsWidget->CaCertpathURLRequester->show();
ProfileCertOptionsWidget->certpathURLRequester->show();
- ProfileCertOptionsWidget->sizeHint();
+ ProfileCertOptionsWidget->tqsizeHint();
}
}
@@ -7092,7 +7092,7 @@ bool PreferencesDialog::getVpncHasHybridSupport()
{
if (tool->Name == "vpnc")
{
- GlobalConfig->appendLogEntry ( i18n ( "vpnc capabilities: %1" ).arg( tool->Capabilities),GlobalConfig->debug );
+ GlobalConfig->appendLogEntry ( i18n ( "vpnc capabilities: %1" ).tqarg( tool->Capabilities),GlobalConfig->debug );
if( tool->Capabilities.find(i18n("openssl (certificate) support"),0,-1) > -1 )
{
hasHybridSupport = true;
@@ -7104,7 +7104,7 @@ bool PreferencesDialog::getVpncHasHybridSupport()
return hasHybridSupport;
}
-void PreferencesDialog::slotStatusMsg ( const QString &text, int id )
+void PreferencesDialog::slotStatusMsg ( const TQString &text, int id )
{
if (!GlobalConfig->statusbar != 0)
{
@@ -7120,7 +7120,7 @@ void PreferencesDialog::slotStatusMsg ( const QString &text, int id )
}
}
-void PreferencesDialog::slotProfileCreated(QString Name)
+void PreferencesDialog::slotProfileCreated(TQString Name)
{
ProfileGeneralSelector->insertItem( Name );
ProfileNetworkRouteSelector->insertItem( Name );