Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

1 files changed, 48 insertions, 48 deletions

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