From 1d9c18c8a07f4833695c6a2ab978698ae1cc90e7 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:33:13 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- src/newprofilewizard.cpp | 148 +++++++++++++++++++++++------------------------ 1 file changed, 74 insertions(+), 74 deletions(-) (limited to 'src/newprofilewizard.cpp') diff --git a/src/newprofilewizard.cpp b/src/newprofilewizard.cpp index e627bb9..69fec28 100644 --- a/src/newprofilewizard.cpp +++ b/src/newprofilewizard.cpp @@ -174,10 +174,10 @@ void NewProfileWizard::setupPages() // page1->setSpacing(8); TQLabel *setupPixmapContent1 = new TQLabel ( page1 ); setupPixmapContent1->setPixmap ( *SetupPixmap ); - setupPixmapContent1->resize ( setupPixmapContent1->tqsizeHint() ); + setupPixmapContent1->resize ( setupPixmapContent1->sizeHint() ); newprofilewizardstartcontent = new NewProfileWizardStart ( page1 ); - newprofilewizardstartcontent->resize ( newprofilewizardstartcontent->tqsizeHint() ); - page1->tqsizeHint(); + newprofilewizardstartcontent->resize ( newprofilewizardstartcontent->sizeHint() ); + page1->sizeHint(); addPage ( page1, "" + i18n ( "Welcome" ) + "" ); // type selection @@ -185,11 +185,11 @@ void NewProfileWizard::setupPages() // newprofilewizardtypeselectionpage->setSpacing(8); TQLabel *setupPixmapContent2 = new TQLabel ( newprofilewizardtypeselectionpage ); setupPixmapContent2->setPixmap ( *SetupPixmap ); - setupPixmapContent2->resize ( setupPixmapContent2->tqsizeHint() ); + setupPixmapContent2->resize ( setupPixmapContent2->sizeHint() ); newprofilewizardtypeselectionpagecontent = new NewProfileWizardTypeSelection ( newprofilewizardtypeselectionpage ); newprofilewizardtypeselectionpagecontent->FreeswanRadioButton->setText ( i18n ( "IPSec (%1)" ).arg ( "FreeS/WAN/Openswan/strongSwan" ) ); newprofilewizardtypeselectionpagecontent->L2tpFreeswanRadioButton->setText ( i18n ( "L2TP over IPSec (%1)" ).arg ( "FreeS/WAN/Openswan/strongSwan" ) ); - newprofilewizardtypeselectionpage->tqsizeHint(); + newprofilewizardtypeselectionpage->sizeHint(); addPage ( newprofilewizardtypeselectionpage, "" + i18n ( "Type selection" ) + "" ); // cisco @@ -197,17 +197,17 @@ void NewProfileWizard::setupPages() // newprofilewizardciscoselectionpage->setSpacing(8); TQLabel *setupPixmapContent3 = new TQLabel ( newprofilewizardciscoselectionpage ); setupPixmapContent3->setPixmap ( *SetupPixmap ); - setupPixmapContent3->resize ( setupPixmapContent3->tqsizeHint() ); + setupPixmapContent3->resize ( setupPixmapContent3->sizeHint() ); newprofilewizardciscoselectionpagecontent = new NewProfileWizardCiscoSelection ( newprofilewizardciscoselectionpage ); - newprofilewizardciscoselectionpage->tqsizeHint(); + newprofilewizardciscoselectionpage->sizeHint(); newprofilewizardciscomanuallypage = new TQHBox ( 0 ); // newprofilewizardciscomanuallypage->setSpacing(8); TQLabel *setupPixmapContent4 = new TQLabel ( newprofilewizardciscomanuallypage ); setupPixmapContent4->setPixmap ( *SetupPixmap ); - setupPixmapContent4->resize ( setupPixmapContent4->tqsizeHint() ); + setupPixmapContent4->resize ( setupPixmapContent4->sizeHint() ); newprofilewizardciscomanuallypagecontent = new NewProfileWizardCiscoManually ( newprofilewizardciscomanuallypage ); - newprofilewizardciscomanuallypage->tqsizeHint(); + newprofilewizardciscomanuallypage->sizeHint(); connect ( newprofilewizardciscomanuallypagecontent->GroupPasswordLineEdit , TQT_SIGNAL ( textChanged ( const TQString& ) ), this, TQT_SLOT ( pskToggled ( const TQString& ) ) ); @@ -216,7 +216,7 @@ void NewProfileWizard::setupPages() // newprofilewizardracoonpage->setSpacing(8); TQLabel *setupPixmapContent5 = new TQLabel ( newprofilewizardracoonpage ); setupPixmapContent5->setPixmap ( *SetupPixmap ); - setupPixmapContent5->resize ( setupPixmapContent5->tqsizeHint() ); + setupPixmapContent5->resize ( setupPixmapContent5->sizeHint() ); newprofilewizardracoonpagecontent = new NewProfileWizardRacoon ( newprofilewizardracoonpage ); newprofilewizardracoonpagecontent->ExchangeModeComboBox->insertItem ( "main", 0 ); newprofilewizardracoonpagecontent->ExchangeModeComboBox->insertItem ( "aggressive", 1 ); @@ -347,32 +347,32 @@ void NewProfileWizard::setupPages() newprofilewizardracoonpagecontent->PerfectForwardSecurityCheckbox->hide(); newprofilewizardracoonpagecontent->PerfectForwardSecrecyCombobox->hide(); - newprofilewizardracoonpage->tqsizeHint(); + newprofilewizardracoonpage->sizeHint(); //freeswan newprofilewizardfreeswanselectionpage = new TQHBox ( 0 ); // newprofilewizardfreeswanselectionpage->setSpacing(8); TQLabel *setupPixmapContent711 = new TQLabel ( newprofilewizardfreeswanselectionpage ); setupPixmapContent711->setPixmap ( *SetupPixmap ); - setupPixmapContent711->resize ( setupPixmapContent711->tqsizeHint() ); + setupPixmapContent711->resize ( setupPixmapContent711->sizeHint() ); newprofilewizardfreeswanselectionpagecontent = new NewProfileWizardOpenvpnSelection ( newprofilewizardfreeswanselectionpage ); newprofilewizardfreeswanselectionpagecontent->OpenvpnImportRadioButton->setText(i18n("Import &Ipsec config file")); - newprofilewizardfreeswanselectionpage->tqsizeHint(); + newprofilewizardfreeswanselectionpage->sizeHint(); newprofilewizardfreeswanpage = new TQHBox ( 0 ); // newprofilewizardfreeswanpage->setSpacing(8); TQLabel *setupPixmapContent6 = new TQLabel ( newprofilewizardfreeswanpage ); setupPixmapContent6->setPixmap ( *SetupPixmap ); - setupPixmapContent6->resize ( setupPixmapContent6->tqsizeHint() ); + setupPixmapContent6->resize ( setupPixmapContent6->sizeHint() ); newprofilewizardfreeswanpagecontent = new NewProfileWizardFreeswan ( newprofilewizardfreeswanpage ); - newprofilewizardfreeswanpage->tqsizeHint(); + newprofilewizardfreeswanpage->sizeHint(); //freeswan newprofilewizardfreeswanpage = new TQHBox ( 0 ); // newprofilewizardfreeswanpage->setSpacing(8); TQLabel *setupPixmapContent66 = new TQLabel ( newprofilewizardfreeswanpage ); setupPixmapContent66->setPixmap ( *SetupPixmap ); - setupPixmapContent66->resize ( setupPixmapContent66->tqsizeHint() ); + setupPixmapContent66->resize ( setupPixmapContent66->sizeHint() ); newprofilewizardfreeswanpagecontent = new NewProfileWizardFreeswan ( newprofilewizardfreeswanpage ); newprofilewizardfreeswanpagecontent->LocalIdTypeCombobox->insertItem(i18n("Certificate ID")); @@ -408,24 +408,24 @@ void NewProfileWizard::setupPages() connect ( newprofilewizardfreeswanpagecontent->LocalIdTypeCombobox, TQT_SIGNAL ( highlighted ( const TQString& ) ), this, TQT_SLOT ( localIDTypeIpsecToggled ( const TQString& ) ) ); connect ( newprofilewizardfreeswanpagecontent->RemoteIdTypeCombobox, TQT_SIGNAL ( highlighted ( const TQString& ) ), this, TQT_SLOT ( remoteIDTypeIpsecToggled ( const TQString& ) ) ); - newprofilewizardfreeswanpage->tqsizeHint(); + newprofilewizardfreeswanpage->sizeHint(); // openvpn newprofilewizardopenvpnselectionpage = new TQHBox ( 0 ); // newprofilewizardopenvpnselectionpage->setSpacing(8); TQLabel *setupPixmapContent7 = new TQLabel ( newprofilewizardopenvpnselectionpage ); setupPixmapContent7->setPixmap ( *SetupPixmap ); - setupPixmapContent7->resize ( setupPixmapContent7->tqsizeHint() ); + setupPixmapContent7->resize ( setupPixmapContent7->sizeHint() ); newprofilewizardopenvpnselectionpagecontent = new NewProfileWizardOpenvpnSelection ( newprofilewizardopenvpnselectionpage ); - newprofilewizardopenvpnselectionpage->tqsizeHint(); + newprofilewizardopenvpnselectionpage->sizeHint(); newprofilewizardopenvpnauthpage = new TQHBox ( 0 ); // newprofilewizardopenvpnauthpage->setSpacing(8); TQLabel *setupPixmapContent71 = new TQLabel ( newprofilewizardopenvpnauthpage ); setupPixmapContent71->setPixmap ( *SetupPixmap ); - setupPixmapContent71->resize ( setupPixmapContent71->tqsizeHint() ); + setupPixmapContent71->resize ( setupPixmapContent71->sizeHint() ); newprofilewizardopenvpnauthpagecontent = new NewProfileWizardOpenvpnAuth ( newprofilewizardopenvpnauthpage ); - newprofilewizardopenvpnauthpage->tqsizeHint(); + newprofilewizardopenvpnauthpage->sizeHint(); connect ( newprofilewizardopenvpnauthpagecontent->AuthWithUsernameAndPasswordCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( authenticateWithUsernameAndPasswordToggled ( bool ) ) ); connect ( newprofilewizardopenvpnauthpagecontent->UseAuthenticationAlgorithmCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( useAuthenticationAlgorithmToggled ( bool ) ) ); @@ -433,9 +433,9 @@ void NewProfileWizard::setupPages() // newprofilewizardopenvpnpage->setSpacing(8); TQLabel *setupPixmapContent8 = new TQLabel ( newprofilewizardopenvpnpage ); setupPixmapContent8->setPixmap ( *SetupPixmap ); - setupPixmapContent8->resize ( setupPixmapContent8->tqsizeHint() ); + setupPixmapContent8->resize ( setupPixmapContent8->sizeHint() ); newprofilewizardopenvpnpagecontent = new NewProfileWizardOpenvpn ( newprofilewizardopenvpnpage ); - newprofilewizardopenvpnpage->tqsizeHint(); + newprofilewizardopenvpnpage->sizeHint(); newprofilewizardopenvpnpagecontent->TunnelDeviceTypeComboBox->insertItem ( "tun" ); newprofilewizardopenvpnpagecontent->TunnelDeviceTypeComboBox->insertItem ( "tap" ); newprofilewizardopenvpnpagecontent->NsCertTypeComboBox->insertItem ( "client" ); @@ -476,9 +476,9 @@ void NewProfileWizard::setupPages() // newprofilewizardpptppage->setSpacing(8); TQLabel *setupPixmapContent9 = new TQLabel ( newprofilewizardpptppage ); setupPixmapContent9->setPixmap ( *SetupPixmap ); - setupPixmapContent9->resize ( setupPixmapContent9->tqsizeHint() ); + setupPixmapContent9->resize ( setupPixmapContent9->sizeHint() ); newprofilewizardpptppagecontent = new NewProfileWizardPptp ( newprofilewizardpptppage ); - newprofilewizardpptppage->tqsizeHint(); + newprofilewizardpptppage->sizeHint(); newprofilewizardpptppagecontent->DnsServerLineedit->setEnabled ( false ); newprofilewizardpptppagecontent->RequireMppeCheckbox->setChecked( profileData->getRequireMppe() ); newprofilewizardpptppagecontent->Refuse128BitEncryptionCheckbox->setChecked( profileData->getRefuse128BitEncryption() ); @@ -513,9 +513,9 @@ void NewProfileWizard::setupPages() // newprofilewizardvtunpage->setSpacing(8); TQLabel *setupPixmapContent19 = new TQLabel ( newprofilewizardvtunpage ); setupPixmapContent19->setPixmap ( *SetupPixmap ); - setupPixmapContent19->resize ( setupPixmapContent19->tqsizeHint() ); + setupPixmapContent19->resize ( setupPixmapContent19->sizeHint() ); newprofilewizardvtunpagecontent = new ProfileVtunOptions ( newprofilewizardvtunpage ); - newprofilewizardvtunpage->tqsizeHint(); + newprofilewizardvtunpage->sizeHint(); connect ( newprofilewizardvtunpagecontent->PortCheckbox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( usePortToggled ( bool ) ) ); // ssh @@ -523,9 +523,9 @@ void NewProfileWizard::setupPages() // newprofilewizardsshpage->setSpacing(8); TQLabel *setupPixmapContent191 = new TQLabel ( newprofilewizardsshpage ); setupPixmapContent191->setPixmap ( *SetupPixmap ); - setupPixmapContent191->resize ( setupPixmapContent191->tqsizeHint() ); + setupPixmapContent191->resize ( setupPixmapContent191->sizeHint() ); newprofilewizardsshpagecontent = new ProfileSshOptions ( newprofilewizardsshpage ); - newprofilewizardsshpage->tqsizeHint(); + newprofilewizardsshpage->sizeHint(); TQString Home= TQString(getenv("HOME")); if (!Home.isEmpty()) @@ -535,7 +535,7 @@ void NewProfileWizard::setupPages() //if (GlobalConfig->KvpncDebugLevel > 2) //{ - // GlobalConfig->appendLogEntry(i18n("SSH files: %1").tqarg(KeyFiles.join(",")),GlobalConfig->debug); + // GlobalConfig->appendLogEntry(i18n("SSH files: %1").arg(KeyFiles.join(",")),GlobalConfig->debug); //} if (KeyFiles.size() > 1) @@ -545,13 +545,13 @@ void NewProfileWizard::setupPages() TQString item = TQString(*it); if (GlobalConfig->KvpncDebugLevel > 2) { - //GlobalConfig->appendLogEntry(i18n("processing entry: %1").tqarg(item),GlobalConfig->debug); + //GlobalConfig->appendLogEntry(i18n("processing entry: %1").arg(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").tqarg(*it),GlobalConfig->debug); + GlobalConfig->appendLogEntry(i18n("SSH key found: %1").arg(*it),GlobalConfig->debug); } newprofilewizardsshpagecontent->SshKeyComboBox->insertItem(*it); } @@ -564,9 +564,9 @@ void NewProfileWizard::setupPages() // newprofilewizardauthselectionpage->setSpacing(8); TQLabel *setupPixmapContent81 = new TQLabel ( newprofilewizardauthselectionpage ); setupPixmapContent81->setPixmap ( *SetupPixmap ); - setupPixmapContent81->resize ( setupPixmapContent81->tqsizeHint() ); + setupPixmapContent81->resize ( setupPixmapContent81->sizeHint() ); newprofilewizardauthselectioncontent = new NewProfileWizardAuthSelection ( newprofilewizardauthselectionpage ); - newprofilewizardauthselectionpage->tqsizeHint(); + newprofilewizardauthselectionpage->sizeHint(); newprofilewizardauthselectioncontent->CertificateRadioButton->setChecked ( true ); newprofilewizardauthselectioncontent->HybridRadioButton->hide (); @@ -575,9 +575,9 @@ void NewProfileWizard::setupPages() newprofilewizardvirtualipaddresspage = new TQHBox ( 0 ); TQLabel *setupPixmapContent_virtualip = new TQLabel ( newprofilewizardvirtualipaddresspage ); setupPixmapContent_virtualip->setPixmap ( *SetupPixmap ); - setupPixmapContent_virtualip->resize ( setupPixmapContent_virtualip->tqsizeHint() ); + setupPixmapContent_virtualip->resize ( setupPixmapContent_virtualip->sizeHint() ); profilenetworkvirtualipoptionscontent = new ProfileNetworkVirtualIpOptions ( newprofilewizardvirtualipaddresspage ); - newprofilewizardvirtualipaddresspage->tqsizeHint(); + newprofilewizardvirtualipaddresspage->sizeHint(); insertPage ( newprofilewizardvirtualipaddresspage, "" + i18n ( "Virtual IP address options" ) + "",-1 ); connect ( profilenetworkvirtualipoptionscontent->UseVirtualIPCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( useVirtualIpAddressToggled ( bool ) ) ); @@ -586,9 +586,9 @@ void NewProfileWizard::setupPages() // newprofilewizardpskpage->setSpacing(8); TQLabel *setupPixmapContent72 = new TQLabel ( newprofilewizardpskpage ); setupPixmapContent72->setPixmap ( *SetupPixmap ); - setupPixmapContent72->resize ( setupPixmapContent72->tqsizeHint() ); + setupPixmapContent72->resize ( setupPixmapContent72->sizeHint() ); newprofilewizardpskcontent = new NewProfileWizardPsk ( newprofilewizardpskpage ); - newprofilewizardpskpage->tqsizeHint(); + newprofilewizardpskpage->sizeHint(); connect ( newprofilewizardpskcontent->PskInFileCheckBox , TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( pskIsInFileToggled ( bool ) ) ); connect ( newprofilewizardpskcontent->PSKLineEdit , TQT_SIGNAL ( textChanged ( const TQString & ) ), this, TQT_SLOT ( pskInputToggled ( const TQString& ) ) ); @@ -597,9 +597,9 @@ void NewProfileWizard::setupPages() // newprofilewizardp12certselectionpage->setSpacing(8); TQLabel *setupPixmapContent74 = new TQLabel ( newprofilewizardp12certselectionpage ); setupPixmapContent74->setPixmap ( *SetupPixmap ); - setupPixmapContent74->resize ( setupPixmapContent74->tqsizeHint() ); + setupPixmapContent74->resize ( setupPixmapContent74->sizeHint() ); newprofilewizardp12certselectioncontent = new NewProfileWizardP12CertSelection ( newprofilewizardp12certselectionpage ); - newprofilewizardp12certselectionpage->tqsizeHint(); + newprofilewizardp12certselectionpage->sizeHint(); connect ( newprofilewizardp12certselectioncontent->UseSmartcardCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( useSmartcardOnCertFormateToggled ( bool ) ) ); // cert @@ -607,9 +607,9 @@ void NewProfileWizard::setupPages() // newprofilewizardcertpage->setSpacing(8); TQLabel *setupPixmapContent73 = new TQLabel ( newprofilewizardcertpage ); setupPixmapContent73->setPixmap ( *SetupPixmap ); - setupPixmapContent73->resize ( setupPixmapContent73->tqsizeHint() ); + setupPixmapContent73->resize ( setupPixmapContent73->sizeHint() ); newprofilewizardcertcontent = new NewProfileWizardCert ( newprofilewizardcertpage ); - newprofilewizardcertpage->tqsizeHint(); + newprofilewizardcertpage->sizeHint(); connect ( newprofilewizardcertcontent->UseSpecialServerCertificateCheckBox , TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( useSpecialServerCertificateToggled ( bool ) ) ); connect ( newprofilewizardcertcontent->UseSmartcardCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( useSmartcardToggled ( bool ) ) ); connect ( newprofilewizardcertcontent->UsePkcs11ProvidersCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( usePkcs11ProvidersToggled ( bool ) ) ); @@ -625,9 +625,9 @@ void NewProfileWizard::setupPages() // newprofilewizarduserpage->setSpacing(8); TQLabel *setupPixmapContent75 = new TQLabel ( newprofilewizarduserpage ); setupPixmapContent75->setPixmap ( *SetupPixmap ); - setupPixmapContent75->resize ( setupPixmapContent75->tqsizeHint() ); + setupPixmapContent75->resize ( setupPixmapContent75->sizeHint() ); newprofilewizarduserpagecontent = new NewProfileWizardUser ( newprofilewizarduserpage ); - newprofilewizarduserpage->tqsizeHint(); + newprofilewizarduserpage->sizeHint(); connect ( newprofilewizarduserpagecontent->PasswordEdit , TQT_SIGNAL ( textChanged ( const TQString& ) ), this, TQT_SLOT ( userpassToggled ( const TQString& ) ) ); connect ( newprofilewizarduserpagecontent->UsernameLineEdit , TQT_SIGNAL ( textChanged ( const TQString& ) ), this, TQT_SLOT ( usernameToggled ( const TQString& ) ) ); @@ -642,9 +642,9 @@ void NewProfileWizard::setupPages() // newprofilewizardnetworkpage->setSpacing(8); TQLabel *setupPixmapContent76 = new TQLabel ( newprofilewizardnetworkpage ); setupPixmapContent76->setPixmap ( *SetupPixmap ); - setupPixmapContent76->resize ( setupPixmapContent76->tqsizeHint() ); + setupPixmapContent76->resize ( setupPixmapContent76->sizeHint() ); newprofilewizardnetworkcontent = new NewProfileWizardNetwork ( newprofilewizardnetworkpage ); - newprofilewizardnetworkpage->tqsizeHint(); + newprofilewizardnetworkpage->sizeHint(); newprofilewizardnetworkcontent->NetworkDeviceComboBox->insertItem ( "default" ); NetworkInterface iface ( GlobalConfig, GlobalConfig->appPointer ); @@ -673,9 +673,9 @@ void NewProfileWizard::setupPages() // newprofilewizardnetworkroutepage->setSpacing(8); TQLabel *setupPixmapContent761 = new TQLabel ( newprofilewizardnetworkroutepage ); setupPixmapContent761->setPixmap ( *SetupPixmap ); - setupPixmapContent761->resize ( setupPixmapContent761->tqsizeHint() ); + setupPixmapContent761->resize ( setupPixmapContent761->sizeHint() ); newprofilewizardnetworkroutecontent = new ProfileNetworkRouteOptions ( newprofilewizardnetworkroutepage ); - newprofilewizardnetworkroutepage->tqsizeHint(); + newprofilewizardnetworkroutepage->sizeHint(); connect(newprofilewizardnetworkroutecontent->DefaultRouteComboBox, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(defaultRouteToggled(const TQString&))); @@ -687,9 +687,9 @@ void NewProfileWizard::setupPages() // newprofilewizardnatpage->setSpacing(8); TQLabel *setupPixmapContent77 = new TQLabel ( newprofilewizardnatpage ); setupPixmapContent77->setPixmap ( *SetupPixmap ); - setupPixmapContent77->resize ( setupPixmapContent77->tqsizeHint() ); + setupPixmapContent77->resize ( setupPixmapContent77->sizeHint() ); newprofilewizardnatcontent = new NewProfileWizardNat ( newprofilewizardnatpage ); - newprofilewizardnatpage->tqsizeHint(); + newprofilewizardnatpage->sizeHint(); newprofilewizardnatcontent->UseUdpCheckbox->setChecked ( true ); newprofilewizardnatcontent->UseNatCheckbox->setChecked ( true ); connect ( newprofilewizardnatcontent->UseNatCheckbox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( useNatToggled ( bool ) ) ); @@ -701,9 +701,9 @@ void NewProfileWizard::setupPages() // newprofilewizardconnectionstatuscheckpage->setSpacing(8); TQLabel *setupPixmapContent79 = new TQLabel ( newprofilewizardconnectionstatuscheckpage ); setupPixmapContent79->setPixmap ( *SetupPixmap ); - setupPixmapContent79->resize ( setupPixmapContent79->tqsizeHint() ); + setupPixmapContent79->resize ( setupPixmapContent79->sizeHint() ); newprofilewizardconnectionstatuscheckcontent = new NewProfileWizardConnectionStatusCheck ( newprofilewizardconnectionstatuscheckpage ); - newprofilewizardconnectionstatuscheckpage->tqsizeHint(); + newprofilewizardconnectionstatuscheckpage->sizeHint(); insertPage ( newprofilewizardconnectionstatuscheckpage, "" + i18n ( "Connection status check" ) + "", -1 ); connect ( newprofilewizardconnectionstatuscheckcontent->PingUserdefiniedAddressCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( pingIpAfterConnectToggled ( bool ) ) ); connect ( newprofilewizardconnectionstatuscheckcontent->UseConnectionStatusCheckCheckBox, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( connectionStatusCheckToggled ( bool ) ) ); @@ -714,9 +714,9 @@ void NewProfileWizard::setupPages() // newprofilewizardconnectoptionspage->setSpacing(8); TQLabel *setupPixmapContent80 = new TQLabel ( newprofilewizardconnectoptionspage ); setupPixmapContent80->setPixmap ( *SetupPixmap ); - setupPixmapContent80->resize ( setupPixmapContent80->tqsizeHint() ); + setupPixmapContent80->resize ( setupPixmapContent80->sizeHint() ); newprofilewizardconnectoptionscontent = new NewProfileWizardConnectOptions ( newprofilewizardconnectoptionspage ); - newprofilewizardconnectoptionspage->tqsizeHint(); + newprofilewizardconnectoptionspage->sizeHint(); newprofilewizardconnectoptionscontent->DoAutoConnectCheckBox->hide(); //TODO later newprofilewizardconnectoptionscontent->AutoConnectProfileComboBox->hide(); //TODO_ later insertPage ( newprofilewizardconnectoptionspage, "" + i18n ( "Connect options" ) + "", -1 ); @@ -726,9 +726,9 @@ void NewProfileWizard::setupPages() // newprofilewizardgeneralpage->setSpacing(8); TQLabel *setupPixmapContent78 = new TQLabel ( newprofilewizardgeneralpage ); setupPixmapContent78->setPixmap ( *SetupPixmap ); - setupPixmapContent78->resize ( setupPixmapContent78->tqsizeHint() ); + setupPixmapContent78->resize ( setupPixmapContent78->sizeHint() ); newprofilewizardgeneralpagecontent = new NewProfileWizardGeneral ( newprofilewizardgeneralpage ); - newprofilewizardgeneralpage->tqsizeHint(); + newprofilewizardgeneralpage->sizeHint(); insertPage ( newprofilewizardgeneralpage, "" + i18n ( "General settings" ) + "", -1 ); // setup end page @@ -736,12 +736,12 @@ void NewProfileWizard::setupPages() // endpage->setSpacing(8); TQLabel *setupPixmapContent11 = new TQLabel ( endpage ); setupPixmapContent11->setPixmap ( *SetupPixmapFinal ); - setupPixmapContent11->resize ( setupPixmapContent11->tqsizeHint() ); + setupPixmapContent11->resize ( setupPixmapContent11->sizeHint() ); TQLabel *endpagecontent = new TQLabel ( endpage ); endpagecontent->setMargin ( 11 ); endpagecontent->setText ( i18n ( "Now you have completed all steps for creating a new profile.\nClick \"Finish\" to continue." ) ); - endpagecontent->setMaximumSize ( endpagecontent->tqsizeHint() ); - endpage->tqsizeHint(); + endpagecontent->setMaximumSize ( endpagecontent->sizeHint() ); + endpage->sizeHint(); insertPage ( endpage, "" + i18n ( "Finish" ) + "", -1 ); // last page } @@ -796,7 +796,7 @@ void NewProfileWizard::next () if ( it->getName() == Name ) { //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::information ( this, i18n( "Profile name exists!\n It will be renamed to \"%1\"." ).arg( account->getName() ), i18n( "Name exist, renamed" ) ); KMessageBox::error ( this, i18n ( "Profile name exists!" ), i18n ( "Name Exists" ) ); TQString newName = KInputDialog::getText ( i18n ( "New Name" ), i18n ( "New name for profile:" ), TQString ( Name += "_2" ), &ok ); @@ -1674,7 +1674,7 @@ void NewProfileWizard::next () { profileData->setUseCustomEsp(true); if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry ( i18n ( "Use custom %1: %2" ).arg ( i18n("ESP") ).tqarg(i18n("yes")), KVpncConfig::debug ); + GlobalConfig->appendLogEntry ( i18n ( "Use custom %1: %2" ).arg ( i18n("ESP") ).arg(i18n("yes")), KVpncConfig::debug ); profileData->setIpsecEsp(EspList.join(",")); @@ -1692,14 +1692,14 @@ void NewProfileWizard::next () { profileData->setUseCustomEsp(false); if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry ( i18n ( "Use custom %1: %2" ).arg ( i18n("ESP") ).tqarg(i18n("no")), KVpncConfig::debug ); + GlobalConfig->appendLogEntry ( i18n ( "Use custom %1: %2" ).arg ( i18n("ESP") ).arg(i18n("no")), KVpncConfig::debug ); } if(newprofilewizardfreeswanpagecontent->UseCustomIkeCheckBox->isChecked() && !IkeList.isEmpty()) { profileData->setUseCustomIke(true); if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry ( i18n ( "Use custom %1: %2" ).arg ( i18n("IKE") ).tqarg(i18n("yes")), KVpncConfig::debug ); + GlobalConfig->appendLogEntry ( i18n ( "Use custom %1: %2" ).arg ( i18n("IKE") ).arg(i18n("yes")), KVpncConfig::debug ); profileData->setIpsecIke(IkeList.join(",")); @@ -1717,7 +1717,7 @@ void NewProfileWizard::next () { profileData->setUseCustomIke(false); if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry ( i18n ( "Use custom %1: %2" ).arg ( i18n("IKE") ).tqarg(i18n("false")), KVpncConfig::debug ); + GlobalConfig->appendLogEntry ( i18n ( "Use custom %1: %2" ).arg ( i18n("IKE") ).arg(i18n("false")), KVpncConfig::debug ); } if (ok) @@ -1978,7 +1978,7 @@ void NewProfileWizard::next () profileData->setAuthType ( VpnAccountData::cert ); newprofilewizardcertcontent->x509certURLRequester->show(); - newprofilewizardcertcontent->x509certURLRequester->tqsizeHint(); + newprofilewizardcertcontent->x509certURLRequester->sizeHint(); newprofilewizardcertcontent->x509certComboBox->hide(); @@ -2041,7 +2041,7 @@ void NewProfileWizard::next () newprofilewizardcertcontent->LabelPrivateKeyPath->hide(); newprofilewizardcertcontent->privkeypathURLRequester->hide(); newprofilewizardcertcontent->LabelCaCertificatePath->hide(); - newprofilewizardcertcontent->CertificateGroupBox->resize(newprofilewizardcertcontent->CertificateGroupBox->tqsizeHint()); + newprofilewizardcertcontent->CertificateGroupBox->resize(newprofilewizardcertcontent->CertificateGroupBox->sizeHint()); insertPage ( newprofilewizardcertpage, "" + i18n ( "Certificate settings" ) + "", indexOf ( currentpage ) + 1 ); @@ -2064,7 +2064,7 @@ void NewProfileWizard::next () // newprofilewizardcertcontent->LabelCertificate->setText(i18n("Certificate (enter name here):")); newprofilewizardcertcontent->x509certURLRequester->hide(); newprofilewizardcertcontent->x509certComboBox->show(); - newprofilewizardcertcontent->x509certComboBox->tqsizeHint(); + newprofilewizardcertcontent->x509certComboBox->sizeHint(); newprofilewizardcertcontent->x509certComboBox->setCurrentItem(0); } @@ -2377,13 +2377,13 @@ void NewProfileWizard::next () profileData->setPskIsInFile(newprofilewizardsshpagecontent->CostumKeyRadioButton->isChecked()); profileData->setPreSharedKeyFile(newprofilewizardsshpagecontent->CostumkeyURLRequester->url()); if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry ( i18n ( "SSH: use costum key: %1" ).tqarg(newprofilewizardsshpagecontent->CostumkeyURLRequester->url()) , KVpncConfig::debug ); + GlobalConfig->appendLogEntry ( i18n ( "SSH: use costum key: %1" ).arg(newprofilewizardsshpagecontent->CostumkeyURLRequester->url()) , KVpncConfig::debug ); } else { profileData->setPreSharedKey(newprofilewizardsshpagecontent->SshKeyComboBox->currentText()); if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry ( i18n ( "SSH: use autotected key: %1" ).tqarg(newprofilewizardsshpagecontent->SshKeyComboBox->currentText()) , KVpncConfig::debug ); + GlobalConfig->appendLogEntry ( i18n ( "SSH: use autotected key: %1" ).arg(newprofilewizardsshpagecontent->SshKeyComboBox->currentText()) , KVpncConfig::debug ); } if (newprofilewizardsshpagecontent->UseSshConfigRemoteScriptCheckBox->isChecked() && !newprofilewizardsshpagecontent->SshConfigRemoteScriptLineEdit->text().isEmpty()) @@ -2392,7 +2392,7 @@ void NewProfileWizard::next () profileData->setSshConfigRemoteScript(newprofilewizardsshpagecontent->SshConfigRemoteScriptLineEdit->text()); if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry ( i18n ( "SSH: use ssh config remote script: %1" ).tqarg(newprofilewizardsshpagecontent->SshConfigRemoteScriptLineEdit->text()) , KVpncConfig::debug ); + GlobalConfig->appendLogEntry ( i18n ( "SSH: use ssh config remote script: %1" ).arg(newprofilewizardsshpagecontent->SshConfigRemoteScriptLineEdit->text()) , KVpncConfig::debug ); } else @@ -2402,7 +2402,7 @@ void NewProfileWizard::next () { ok = false; msg += "- " + i18n ( "Special server certificate" ) + "\n"; - GlobalConfig->appendLogEntry( i18n( "%1 cant be empty!" ).tqarg(i18n("ssh config remote script")), GlobalConfig->error); + GlobalConfig->appendLogEntry( i18n( "%1 cant be empty!" ).arg(i18n("ssh config remote script")), GlobalConfig->error); } } @@ -2813,7 +2813,7 @@ void NewProfileWizard::next () if ( validAddr == true ) { if ( GlobalConfig->KvpncDebugLevel > 0 ) - GlobalConfig->appendLogEntry ( i18n ( "Use remote network: %1/%2" ).arg ( addr ).tqarg(newprofilewizardnetworkcontent->RemoteNetMaskComboBox->currentText()), KVpncConfig::debug ); + GlobalConfig->appendLogEntry ( i18n ( "Use remote network: %1/%2" ).arg ( addr ).arg(newprofilewizardnetworkcontent->RemoteNetMaskComboBox->currentText()), KVpncConfig::debug ); profileData->setUseRemoteNetwork(true); profileData->setRemoteNetAddr ( addr ); profileData->setRemoteNetMask ( newprofilewizardnetworkcontent->RemoteNetMaskComboBox->currentText() ); @@ -3650,7 +3650,7 @@ void NewProfileWizard::useSmartcardToggled ( bool ) // } // IpsecToolInfo.collectToolInfo(); // if (IpsecToolInfo.Version.contains("Openswan") || IpsecToolInfo.Version.contains("Free")) -// KMessageBox::information(0,i18n("%1 (IPSec) currently has no working smartcard support (pkcs11). Please use strongSwan instead with enabled smartcard support.").tqarg(IpsecToolInfo.Version.section(' ',0,0)),i18n("Unsupported IPSec version")); +// KMessageBox::information(0,i18n("%1 (IPSec) currently has no working smartcard support (pkcs11). Please use strongSwan instead with enabled smartcard support.").arg(IpsecToolInfo.Version.section(' ',0,0)),i18n("Unsupported IPSec version")); // } } @@ -3687,7 +3687,7 @@ void NewProfileWizard::useSmartcardOnCertFormateToggled ( bool ) // } // IpsecToolInfo.collectToolInfo(); // if (IpsecToolInfo.Version.contains("Openswan") || IpsecToolInfo.Version.contains("Free")) -// KMessageBox::information(0,i18n("%1 (IPSec) currently has no working smartcard support (pkcs11). Please use strongSwan instead with enabled smartcard support.").tqarg(IpsecToolInfo.Version.section(' ',0,0)),i18n("Unsupported IPSec version")); +// KMessageBox::information(0,i18n("%1 (IPSec) currently has no working smartcard support (pkcs11). Please use strongSwan instead with enabled smartcard support.").arg(IpsecToolInfo.Version.section(' ',0,0)),i18n("Unsupported IPSec version")); // } } else -- cgit v1.2.1