diff --git a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_cdma_widget.cpp b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_cdma_widget.cpp index 7e95fd3..196c001 100644 --- a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_cdma_widget.cpp +++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_cdma_widget.cpp @@ -65,9 +65,9 @@ CDMAWidgetImpl::Init() _mainWid->mPassword->setText( _cdmasetting->cdmaConfig.password ); } } - connect( _mainWid->mUsername, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(dirty())); - connect( _mainWid->mPassword, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(dirty())); - connect( _mainWid->mNumber, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(dirty())); + connect( _mainWid->mUsername, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(dirty())); + connect( _mainWid->mPassword, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(dirty())); + connect( _mainWid->mNumber, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(dirty())); } void diff --git a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_gsm_widget.cpp b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_gsm_widget.cpp index f373b04..4554ab3 100644 --- a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_gsm_widget.cpp +++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_gsm_widget.cpp @@ -71,14 +71,14 @@ GSMWidgetImpl::Init() } } - connect( _mainWid->mUsername, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(dirty())); - connect( _mainWid->mPassword, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(dirty())); - connect( _mainWid->mPin, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(dirty())); - connect( _mainWid->mNumber, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(dirty())); - connect( _mainWid->mApn, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(dirty())); - connect( _mainWid->mNetworkId, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(dirty())); - connect( _mainWid->mNetworkType, TQT_SIGNAL(activated(int)), TQT_SLOT(dirty())); - connect( _mainWid->mBand, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(dirty())); + connect( _mainWid->mUsername, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(dirty())); + connect( _mainWid->mPassword, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(dirty())); + connect( _mainWid->mPin, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(dirty())); + connect( _mainWid->mNumber, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(dirty())); + connect( _mainWid->mApn, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(dirty())); + connect( _mainWid->mNetworkId, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(dirty())); + connect( _mainWid->mNetworkType, TQ_SIGNAL(activated(int)), TQ_SLOT(dirty())); + connect( _mainWid->mBand, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(dirty())); } void diff --git a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_info_widget.cpp b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_info_widget.cpp index e9962ee..9af750b 100644 --- a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_info_widget.cpp +++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_info_widget.cpp @@ -50,8 +50,8 @@ InfoWidgetImpl::InfoWidgetImpl(TDENetworkConnection* conn, TQWidget* parent, con void InfoWidgetImpl::Init() { - connect(_mainWid->txtConnectionName, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotNameChanged(const TQString&))); - connect(_mainWid->chkAutoConnect, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotAutoconnectChanged(bool))); + connect(_mainWid->txtConnectionName, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotNameChanged(const TQString&))); + connect(_mainWid->chkAutoConnect, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotAutoconnectChanged(bool))); } void diff --git a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_ipv4_widget.cpp b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_ipv4_widget.cpp index 03db7b4..81d756e 100644 --- a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_ipv4_widget.cpp +++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_ipv4_widget.cpp @@ -53,7 +53,7 @@ IPv4WidgetImpl::Init() { _mainWid->groupIPConfig->setChecked(!(_ipv4_setting->ipConfig.connectionFlags & TDENetworkIPConfigurationFlags::IPV4DHCPIP)); - connect(_mainWid->groupIPConfig, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotIPConfigEnabled(bool))); + connect(_mainWid->groupIPConfig, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotIPConfigEnabled(bool))); _mainWid->txtIP->setInputMask(IP_INPUT_MASK); _mainWid->txtNetmask->setInputMask(IP_INPUT_MASK); @@ -89,11 +89,11 @@ IPv4WidgetImpl::Init() } // connect the signals after setting up the values - connect(_mainWid->txtIP, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotIPAddressChanged(const TQString&))); - connect(_mainWid->txtNetmask, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotNetmaskChanged(const TQString&))); - connect(_mainWid->txtGateway, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotGatewayChanged(const TQString&))); - connect(_mainWid->txtDNSAddresses, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotDNSAddressesChanged(const TQString&))); - connect(_mainWid->txtDNSSearch, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotDNSSearchChanged(const TQString&))); + connect(_mainWid->txtIP, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotIPAddressChanged(const TQString&))); + connect(_mainWid->txtNetmask, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotNetmaskChanged(const TQString&))); + connect(_mainWid->txtGateway, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotGatewayChanged(const TQString&))); + connect(_mainWid->txtDNSAddresses, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotDNSAddressesChanged(const TQString&))); + connect(_mainWid->txtDNSSearch, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotDNSSearchChanged(const TQString&))); } void diff --git a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_ppp_widget.cpp b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_ppp_widget.cpp index 68e75d0..b47e83f 100644 --- a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_ppp_widget.cpp +++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_ppp_widget.cpp @@ -79,18 +79,18 @@ PPPWidgetImpl::Init() _mainWid->mLcpEchoInterval->setValue(_pppsetting->pppConfig.lcpEchoPingInterval); } - connect( _mainWid->mNoAuth, TQT_SIGNAL(toggled(bool)), TQT_SLOT(dirty())); - connect( _mainWid->mRefuseEap, TQT_SIGNAL(toggled(bool)), TQT_SLOT(dirty())); - connect( _mainWid->mRefusePap, TQT_SIGNAL(toggled(bool)), TQT_SLOT(dirty())); - connect( _mainWid->mRefuseChap, TQT_SIGNAL(toggled(bool)), TQT_SLOT(dirty())); - connect( _mainWid->mRefuseMschap, TQT_SIGNAL(toggled(bool)), TQT_SLOT(dirty())); - connect( _mainWid->mRefuseMschapV2, TQT_SIGNAL(toggled(bool)), TQT_SLOT(dirty())); - connect( _mainWid->mNoBsd, TQT_SIGNAL(toggled(bool)), TQT_SLOT(dirty())); - connect( _mainWid->mNoDeflate, TQT_SIGNAL(toggled(bool)), TQT_SLOT(dirty())); - connect( _mainWid->mRequireMppe, TQT_SIGNAL(toggled(bool)), TQT_SLOT(dirty())); - connect( _mainWid->mRequireMppe128, TQT_SIGNAL(toggled(bool)), TQT_SLOT(dirty())); - connect( _mainWid->mStatefulMppe, TQT_SIGNAL(toggled(bool)), TQT_SLOT(dirty())); - connect( _mainWid->mCrtscts, TQT_SIGNAL(toggled(bool)), TQT_SLOT(dirty())); + connect( _mainWid->mNoAuth, TQ_SIGNAL(toggled(bool)), TQ_SLOT(dirty())); + connect( _mainWid->mRefuseEap, TQ_SIGNAL(toggled(bool)), TQ_SLOT(dirty())); + connect( _mainWid->mRefusePap, TQ_SIGNAL(toggled(bool)), TQ_SLOT(dirty())); + connect( _mainWid->mRefuseChap, TQ_SIGNAL(toggled(bool)), TQ_SLOT(dirty())); + connect( _mainWid->mRefuseMschap, TQ_SIGNAL(toggled(bool)), TQ_SLOT(dirty())); + connect( _mainWid->mRefuseMschapV2, TQ_SIGNAL(toggled(bool)), TQ_SLOT(dirty())); + connect( _mainWid->mNoBsd, TQ_SIGNAL(toggled(bool)), TQ_SLOT(dirty())); + connect( _mainWid->mNoDeflate, TQ_SIGNAL(toggled(bool)), TQ_SLOT(dirty())); + connect( _mainWid->mRequireMppe, TQ_SIGNAL(toggled(bool)), TQ_SLOT(dirty())); + connect( _mainWid->mRequireMppe128, TQ_SIGNAL(toggled(bool)), TQ_SLOT(dirty())); + connect( _mainWid->mStatefulMppe, TQ_SIGNAL(toggled(bool)), TQ_SLOT(dirty())); + connect( _mainWid->mCrtscts, TQ_SIGNAL(toggled(bool)), TQ_SLOT(dirty())); } void diff --git a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_serial_widget.cpp b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_serial_widget.cpp index 0f9d7a6..ce6550e 100644 --- a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_serial_widget.cpp +++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_serial_widget.cpp @@ -67,11 +67,11 @@ SerialWidgetImpl::Init() _mainWid->mSendDelay->setValue(_serialsetting->serialConfig.txDelay); } - connect( _mainWid->mBaudRate, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(dirty())); - connect( _mainWid->mDataBits, TQT_SIGNAL(activated(int)), TQT_SLOT(dirty())); - connect( _mainWid->mParity, TQT_SIGNAL(activated(int)), TQT_SLOT(dirty())); - connect( _mainWid->mStopBits, TQT_SIGNAL(activated(int)), TQT_SLOT(dirty())); - connect( _mainWid->mSendDelay, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(dirty())); + connect( _mainWid->mBaudRate, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(dirty())); + connect( _mainWid->mDataBits, TQ_SIGNAL(activated(int)), TQ_SLOT(dirty())); + connect( _mainWid->mParity, TQ_SIGNAL(activated(int)), TQ_SLOT(dirty())); + connect( _mainWid->mStopBits, TQ_SIGNAL(activated(int)), TQ_SLOT(dirty())); + connect( _mainWid->mSendDelay, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(dirty())); } void diff --git a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_vpn_widget.cpp b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_vpn_widget.cpp index 918ee32..28630f2 100644 --- a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_vpn_widget.cpp +++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_vpn_widget.cpp @@ -139,7 +139,7 @@ VPNWidgetImpl::Init() #endif // notification if VPN service is selected - connect(_mainWid->cboServices, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotServiceComboActivated(int))); + connect(_mainWid->cboServices, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotServiceComboActivated(int))); } VPNConfigWidget* diff --git a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp index 5dcd71b..ab09b25 100644 --- a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp +++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp @@ -118,17 +118,17 @@ WirelessSecurityWEPImpl::WirelessSecurityWEPImpl(TDEWiFiConnection* sec, TQWidge break; } - connect(cboAuthentication, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotAuthAlgChanged(int))); - connect(cbKeyType, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotKeyTypeChanged(int))); - connect(txtWEPKey0, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotWepKey0Changed(const TQString&))); - connect(txtWEPKey1, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotWepKey1Changed(const TQString&))); - connect(txtWEPKey2, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotWepKey2Changed(const TQString&))); - connect(txtWEPKey3, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotWepKey3Changed(const TQString&))); - - connect(rbKeyIdx0, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotWepIdx0Checked(bool))); - connect(rbKeyIdx1, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotWepIdx1Checked(bool))); - connect(rbKeyIdx2, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotWepIdx2Checked(bool))); - connect(rbKeyIdx3, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotWepIdx3Checked(bool))); + connect(cboAuthentication, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotAuthAlgChanged(int))); + connect(cbKeyType, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotKeyTypeChanged(int))); + connect(txtWEPKey0, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotWepKey0Changed(const TQString&))); + connect(txtWEPKey1, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotWepKey1Changed(const TQString&))); + connect(txtWEPKey2, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotWepKey2Changed(const TQString&))); + connect(txtWEPKey3, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotWepKey3Changed(const TQString&))); + + connect(rbKeyIdx0, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotWepIdx0Checked(bool))); + connect(rbKeyIdx1, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotWepIdx1Checked(bool))); + connect(rbKeyIdx2, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotWepIdx2Checked(bool))); + connect(rbKeyIdx3, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotWepIdx3Checked(bool))); } void WirelessSecurityWEPImpl::slotAuthAlgChanged(int index) @@ -323,10 +323,10 @@ WirelessSecurityWPAVersionImpl::WirelessSecurityWPAVersionImpl(TDEWiFiConnection cbWPA->setChecked(_security_setting->securitySettings.wpaVersion & TDENetworkWiFiWPAVersionFlags::WPA); cbRSN->setChecked(_security_setting->securitySettings.wpaVersion & TDENetworkWiFiWPAVersionFlags::RSN); - connect(cbWPA, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotWPA1(bool))); - connect(cbRSN, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotWPA2(bool))); + connect(cbWPA, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotWPA1(bool))); + connect(cbRSN, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotWPA2(bool))); - connect(grpUseWPAVersion, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotAuto(bool))); + connect(grpUseWPAVersion, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotAuto(bool))); } void @@ -376,15 +376,15 @@ WirelessSecurityWPACipherImpl::WirelessSecurityWPACipherImpl(TDEWiFiConnection* { _parentdialog = connsettings; - connect(grpUseCipher, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotCipherChangedAuto(bool))); + connect(grpUseCipher, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotCipherChangedAuto(bool))); - connect(chkGroupCipherTKIP, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotGroupCipherChangedTKIP(bool))); - connect(chkGroupCipherCCMP, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotGroupCipherChangedCCMP(bool))); - connect(chkGroupCipherWEP40, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotGroupCipherChangedWEP40(bool))); - connect(chkGroupCipherWEP104, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotGroupCipherChangedWEP104(bool))); + connect(chkGroupCipherTKIP, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotGroupCipherChangedTKIP(bool))); + connect(chkGroupCipherCCMP, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotGroupCipherChangedCCMP(bool))); + connect(chkGroupCipherWEP40, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotGroupCipherChangedWEP40(bool))); + connect(chkGroupCipherWEP104, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotGroupCipherChangedWEP104(bool))); - connect(chkPairwiseCipherTKIP, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotPairwiseCipherChangedTKIP(bool))); - connect(chkPairwiseCipherCCMP, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotPairwiseCipherChangedCCMP(bool))); + connect(chkPairwiseCipherTKIP, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotPairwiseCipherChangedTKIP(bool))); + connect(chkPairwiseCipherCCMP, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotPairwiseCipherChangedCCMP(bool))); chkPairwiseCipherCCMP->setChecked(_security_setting->securitySettings.allowedPairWiseCiphers.contains(TDENetworkWiFiConnectionCipher::Any) || _security_setting->securitySettings.allowedPairWiseCiphers.contains(TDENetworkWiFiConnectionCipher::CipherCCMP)); chkPairwiseCipherTKIP->setChecked(_security_setting->securitySettings.allowedPairWiseCiphers.contains(TDENetworkWiFiConnectionCipher::Any) || _security_setting->securitySettings.allowedPairWiseCiphers.contains(TDENetworkWiFiConnectionCipher::CipherTKIP)); @@ -531,7 +531,7 @@ WirelessSecurityWPAPSKImpl::WirelessSecurityWPAPSKImpl(TDEWiFiConnection* securi if (_security_setting->securitySettings.secretsValid) { txtPSK->setText(_security_setting->securitySettings.psk); } - connect(txtPSK, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotPSKChanged(const TQString&))); + connect(txtPSK, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotPSKChanged(const TQString&))); } void @@ -618,11 +618,11 @@ WirelessSecurityEAPImpl::WirelessSecurityEAPImpl(TDEWiFiConnection* security_set kURLCACert->setEnabled(!_security_setting->eapConfig.forceSystemCaCertificates); // get notified if the method changes - connect(cboMethod, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMethodChanged(int))); - connect(txtIdentity, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotIdentityChanged(const TQString&))); - connect(txtAnonIdentity, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotAnonIdentityChanged(const TQString&))); - connect(txtPassword, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotPasswordChanged(const TQString&))); - connect(chkCAStore, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotUseSystemCaCertChanged(bool))); + connect(cboMethod, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMethodChanged(int))); + connect(txtIdentity, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotIdentityChanged(const TQString&))); + connect(txtAnonIdentity, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotAnonIdentityChanged(const TQString&))); + connect(txtPassword, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotPasswordChanged(const TQString&))); + connect(chkCAStore, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotUseSystemCaCertChanged(bool))); } void WirelessSecurityEAPImpl::slotUseSystemCaCertChanged(bool on) @@ -678,7 +678,7 @@ WirelessSecurityPhase2Impl::WirelessSecurityPhase2Impl(TDEWiFiConnection* securi _allowed_methods.append(TDENetworkIEEE8021xType::None); updateMethodComboBox(); - connect(cboPhase2Method, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPhase2MethodChanged(int))); + connect(cboPhase2Method, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotPhase2MethodChanged(int))); } void WirelessSecurityPhase2Impl::updateMethodComboBox() @@ -792,7 +792,7 @@ WirelessSecurityWidgetImpl::WirelessSecurityWidgetImpl(TDENetworkConnection* con _mainWid = new ConnectionSettingWirelessSecurityWidget(this); layout->addWidget(_mainWid); - TQTimer::singleShot(0, this, TQT_SLOT(slotInit())); + TQTimer::singleShot(0, this, TQ_SLOT(slotInit())); } void @@ -838,9 +838,9 @@ WirelessSecurityWidgetImpl::slotInit() _widgets[SECURITY_IEEE8021X].append(wepencryption); _widgets[SECURITY_IEEE8021X].append(eap); - connect(_mainWid->cboSecurity, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboSecurityActivated(int))); - connect(_mainWid->groupUseEncryption, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotUseEncryptionToggled(bool))); - connect(_mainWid->pbExtra, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotExtraSettingsToggled(bool))); + connect(_mainWid->cboSecurity, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboSecurityActivated(int))); + connect(_mainWid->groupUseEncryption, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotUseEncryptionToggled(bool))); + connect(_mainWid->pbExtra, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotExtraSettingsToggled(bool))); } diff --git a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_widget.cpp b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_widget.cpp index 33dc96b..aabf031 100644 --- a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_widget.cpp +++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_widget.cpp @@ -108,9 +108,9 @@ WirelessWidgetImpl::Init() _searchLine = new TDEListViewSearchLineWidget(_mainWid->lvEssids, _mainWid->framePlaceholder); layout->addWidget(_searchLine); - connect(_mainWid->txtEssid, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotEssidChanged(const TQString&))); - connect(_mainWid->lvEssids, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), this, TQT_SLOT(slotEssidDoubleClicked(TQListViewItem*, const TQPoint&, int)) ); - connect(_mainWid->lvEssids, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotEssidChanged(TQListViewItem*))); + connect(_mainWid->txtEssid, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotEssidChanged(const TQString&))); + connect(_mainWid->lvEssids, TQ_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), this, TQ_SLOT(slotEssidDoubleClicked(TQListViewItem*, const TQPoint&, int)) ); + connect(_mainWid->lvEssids, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, TQ_SLOT(slotEssidChanged(TQListViewItem*))); if (!_new_conn) { diff --git a/tdenetworkmanager/src/configwidgets/tdenetman-connection_settings_dialog.cpp b/tdenetworkmanager/src/configwidgets/tdenetman-connection_settings_dialog.cpp index c3ac242..cf7c294 100644 --- a/tdenetworkmanager/src/configwidgets/tdenetman-connection_settings_dialog.cpp +++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_settings_dialog.cpp @@ -66,11 +66,11 @@ ConnectionSettingsDialogImpl::ConnectionSettingsDialogImpl(TDENetworkConnection* updateDialogForDeviceType(); // get notified if device combo changes - connect(btnConnect, TQT_SIGNAL(clicked()), this, TQT_SLOT( slotConnect()) ); - connect(pbNext, TQT_SIGNAL(clicked()), this, TQT_SLOT( slotNext()) ); - connect(pbBack, TQT_SIGNAL(clicked()), this, TQT_SLOT( slotBack()) ); - connect(pbCancel, TQT_SIGNAL(clicked()), this, TQT_SLOT( slotCancel()) ); - connect(pbSave, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSave()) ); + connect(btnConnect, TQ_SIGNAL(clicked()), this, TQ_SLOT( slotConnect()) ); + connect(pbNext, TQ_SIGNAL(clicked()), this, TQ_SLOT( slotNext()) ); + connect(pbBack, TQ_SIGNAL(clicked()), this, TQ_SLOT( slotBack()) ); + connect(pbCancel, TQ_SIGNAL(clicked()), this, TQ_SLOT( slotCancel()) ); + connect(pbSave, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSave()) ); // nice images for the buttons btnConnect->setIconSet(SmallIcon ("connect_creating", TQIconSet::Automatic)); @@ -402,7 +402,7 @@ void ConnectionSettingsDialogImpl::activateWidget(WidgetInterface* widget) { // allow the widget to press next - connect(widget, TQT_SIGNAL(next()), this, TQT_SLOT(slotNext())); + connect(widget, TQ_SIGNAL(next()), this, TQ_SLOT(slotNext())); // allow the widget to do some initialization widget->Activate(); @@ -416,7 +416,7 @@ void ConnectionSettingsDialogImpl::deactivateWidget(WidgetInterface* widget) { // allow the widget to press next - disconnect(widget, TQT_SIGNAL(next()), this, TQT_SLOT(slotNext())); + disconnect(widget, TQ_SIGNAL(next()), this, TQ_SLOT(slotNext())); // allow the widget to do some initialization widget->Deactivate(); diff --git a/tdenetworkmanager/src/devicetraycomponent.cpp b/tdenetworkmanager/src/devicetraycomponent.cpp index 8bc0eef..3d9daef 100644 --- a/tdenetworkmanager/src/devicetraycomponent.cpp +++ b/tdenetworkmanager/src/devicetraycomponent.cpp @@ -80,8 +80,8 @@ DeviceTrayComponent::DeviceTrayComponent(TQString device, KSystemTray * parent, if (deviceConnMan) { - connect(deviceConnMan, TQT_SIGNAL(networkDeviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)), TQT_SLOT(deviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString))); - connect(deviceConnMan, TQT_SIGNAL(networkDeviceEvent(TDENetworkDeviceEventType::TDENetworkDeviceEventType, TQString)), this, TQT_SLOT(deviceEventHandler(TDENetworkDeviceEventType::TDENetworkDeviceEventType, TQString))); + connect(deviceConnMan, TQ_SIGNAL(networkDeviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)), TQ_SLOT(deviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString))); + connect(deviceConnMan, TQ_SIGNAL(networkDeviceEvent(TDENetworkDeviceEventType::TDENetworkDeviceEventType, TQString)), this, TQ_SLOT(deviceEventHandler(TDENetworkDeviceEventType::TDENetworkDeviceEventType, TQString))); } m_pixmaps[TDENetworkConnectionStatus::Invalid] = "nm_no_connection"; @@ -227,18 +227,18 @@ void DeviceTrayComponent::deviceStateChanged(TDENetworkConnectionStatus::TDENetw // if it is the default active connection // or if it is activating. what if 2 devices are activating simultaneously? if (newState & TDENetworkConnectionStatus::EstablishingLink) { - TQTimer::singleShot(0, this, TQT_SLOT(sendGetCenterStage())); + TQTimer::singleShot(0, this, TQ_SLOT(sendGetCenterStage())); } else if (newState & TDENetworkConnectionStatus::Connected) { if (nm && nm->defaultNetworkDevices().contains(m_device)) { - TQTimer::singleShot(0, this, TQT_SLOT(sendGetCenterStage())); + TQTimer::singleShot(0, this, TQ_SLOT(sendGetCenterStage())); } } else if ((newState & TDENetworkConnectionStatus::LinkUnavailable) || (newState & TDENetworkConnectionStatus::Disconnected) || (newState & TDENetworkConnectionStatus::Failed)) { - TQTimer::singleShot(0, this, TQT_SLOT(sendReleaseCenterStage())); + TQTimer::singleShot(0, this, TQ_SLOT(sendReleaseCenterStage())); } } diff --git a/tdenetworkmanager/src/tdenetman-cellular_device_tray.cpp b/tdenetworkmanager/src/tdenetman-cellular_device_tray.cpp index 50a8284..5d8cfff 100644 --- a/tdenetworkmanager/src/tdenetman-cellular_device_tray.cpp +++ b/tdenetworkmanager/src/tdenetman-cellular_device_tray.cpp @@ -129,7 +129,7 @@ void CellularDeviceTray::addMenuItems(TDEPopupMenu* menu) NetworkMenuItem* item = new NetworkMenuItem(d->dev, conn->UUID, menu); - int id = menu->insertItem(title, item, TQT_SLOT(slotActivate())); + int id = menu->insertItem(title, item, TQ_SLOT(slotActivate())); menu->setItemChecked(id, ((*it) == active_conn)); } diff --git a/tdenetworkmanager/src/tdenetman-connection_editor.cpp b/tdenetworkmanager/src/tdenetman-connection_editor.cpp index c9e144e..63dfe06 100644 --- a/tdenetworkmanager/src/tdenetman-connection_editor.cpp +++ b/tdenetworkmanager/src/tdenetman-connection_editor.cpp @@ -107,18 +107,18 @@ ConnectionEditorImpl::ConnectionEditorImpl(TQWidget* parent, const char* name, b TQPopupMenu* popup = new TQPopupMenu(pbNew); // TODO: move to a factory class - popup->insertItem(TDEGlobal::iconLoader()->loadIcon("wireless", TDEIcon::Small), i18n("Wireless"), this, TQT_SLOT(slotNewWirelessConnection())); - popup->insertItem(TDEGlobal::iconLoader()->loadIcon("wired", TDEIcon::Small), i18n("Wired"), this, TQT_SLOT(slotNewWiredConnection())); + popup->insertItem(TDEGlobal::iconLoader()->loadIcon("wireless", TDEIcon::Small), i18n("Wireless"), this, TQ_SLOT(slotNewWirelessConnection())); + popup->insertItem(TDEGlobal::iconLoader()->loadIcon("wired", TDEIcon::Small), i18n("Wired"), this, TQ_SLOT(slotNewWiredConnection())); // if (!VPNManager::getVPNServices().isEmpty()) { - popup->insertItem(TDEGlobal::iconLoader()->loadIcon("encrypted", TDEIcon::Small), i18n("VPN"), this, TQT_SLOT(slotNewVPNConnection())); + popup->insertItem(TDEGlobal::iconLoader()->loadIcon("encrypted", TDEIcon::Small), i18n("VPN"), this, TQ_SLOT(slotNewVPNConnection())); // } pbNew->setPopup(popup); - connect(pbClose, TQT_SIGNAL(clicked()), this, TQT_SLOT(close())); - connect(pbDelete, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemoveCurrentConnection())); - connect(pbEdit, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditCurrentConnection())); + connect(pbClose, TQ_SIGNAL(clicked()), this, TQ_SLOT(close())); + connect(pbDelete, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemoveCurrentConnection())); + connect(pbEdit, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEditCurrentConnection())); // show all connections fillConnectionList(); @@ -169,7 +169,7 @@ void ConnectionEditorImpl::slotEditNewConnection(TDENetworkConnection* conn) { // open a dialog for editing the connection ConnectionSettingsDialogImpl* dlg = new ConnectionSettingsDialogImpl(conn, true, TQByteArray(), this, "connect_something", false, TQt::WDestructiveClose); - connect(dlg, TQT_SIGNAL(connectionSaved()), this, TQT_SLOT(slotRefreshConnectionList())); + connect(dlg, TQ_SIGNAL(connectionSaved()), this, TQ_SLOT(slotRefreshConnectionList())); dlg->show(); } diff --git a/tdenetworkmanager/src/tdenetman-tray.cpp b/tdenetworkmanager/src/tdenetman-tray.cpp index 4512b8a..f8b0957 100644 --- a/tdenetworkmanager/src/tdenetman-tray.cpp +++ b/tdenetworkmanager/src/tdenetman-tray.cpp @@ -128,8 +128,8 @@ void NewSecretsDialog::init() mainLayout->addWidget(label); mainLayout->addLayout(topLeftLayout); - connect(buttonEdit, TQT_SIGNAL(clicked()), TQT_SLOT(slotDialogEdit())); - connect(buttonCancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(close())); + connect(buttonEdit, TQ_SIGNAL(clicked()), TQ_SLOT(slotDialogEdit())); + connect(buttonCancel, TQ_SIGNAL(clicked()), this, TQ_SLOT(close())); } class TrayPrivate @@ -276,7 +276,7 @@ void Tray::contextMenuAboutToShow (TDEPopupMenu* menu) deviceNewConnAction = actionCollection ()->action (actionName.utf8()); if (!deviceNewConnAction) { - deviceNewConnAction = new TDEAction (menuCaption, 0, (*it), TQT_SLOT(newConnection()), actionCollection(), actionName.utf8()); + deviceNewConnAction = new TDEAction (menuCaption, 0, (*it), TQ_SLOT(newConnection()), actionCollection(), actionName.utf8()); } newConnActionMenu->insert(deviceNewConnAction); } @@ -287,14 +287,14 @@ void Tray::contextMenuAboutToShow (TDEPopupMenu* menu) TDEAction * deviceNewConnAction = 0; TQString menuCaption = "VPN Connection"; TQString actionName = TQString("new_connection_%1").arg("vpn"); - deviceNewConnAction = new TDEAction (menuCaption, 0, this, TQT_SLOT(slotNewVPNConnection()), actionCollection(), actionName.utf8()); + deviceNewConnAction = new TDEAction (menuCaption, 0, this, TQ_SLOT(slotNewVPNConnection()), actionCollection(), actionName.utf8()); newConnActionMenu->insert(deviceNewConnAction); } else if ( devices == 1 ) { newConnAction = actionCollection ()->action ("new_connection"); - TQObject::disconnect( newConnAction, TQT_SIGNAL(activated()) ); - TQObject::connect( newConnAction, TQT_SIGNAL(activated()), d->trayComponents[0], TQT_SLOT(newConnection())); + TQObject::disconnect( newConnAction, TQ_SIGNAL(activated()) ); + TQObject::connect( newConnAction, TQ_SIGNAL(activated()), d->trayComponents[0], TQ_SLOT(newConnection())); } if (newConnAction) { newConnAction->plug(menu); @@ -326,7 +326,7 @@ void Tray::contextMenuAboutToShow (TDEPopupMenu* menu) TQString actionText = conn->friendlyName; if (!deviceNewConnAction) { - deviceNewConnAction = new TDEAction (actionText, 0, &d->signalMapper, TQT_SLOT(map()), actionCollection(), actionName.utf8()); + deviceNewConnAction = new TDEAction (actionText, 0, &d->signalMapper, TQ_SLOT(map()), actionCollection(), actionName.utf8()); } d->signalMapper.setMapping(deviceNewConnAction, d->current_idx); d->act_conn_map.insert(d->current_idx, conn->UUID); @@ -524,8 +524,8 @@ void Tray::createDeviceTrayComponent(TQString dev) } if(devTray) { - connect(devTray, TQT_SIGNAL(needsCenterStage(TrayComponent*, bool)), TQT_SLOT(trayComponentNeedsCenterStage(TrayComponent*, bool))); - connect(devTray, TQT_SIGNAL(uiUpdated()), TQT_SLOT(trayUiChanged())); + connect(devTray, TQ_SIGNAL(needsCenterStage(TrayComponent*, bool)), TQ_SLOT(trayComponentNeedsCenterStage(TrayComponent*, bool))); + connect(devTray, TQ_SIGNAL(uiUpdated()), TQ_SLOT(trayUiChanged())); d->trayComponents.append(devTray); //WILLTODO: sort } @@ -617,7 +617,7 @@ void Tray::connectTrayDeviceManager() { TDENetworkConnectionManager* deviceConnMan = foreground_tray_dev->connectionManager(); if (deviceConnMan) { slotUpdateDeviceState(deviceConnMan->deviceStatus().statusFlags, d->foregroundTrayComponent->lastKnownState, TQString()); - connect(deviceConnMan, TQT_SIGNAL(networkDeviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)), this, TQT_SLOT(slotUpdateDeviceState(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString))); + connect(deviceConnMan, TQ_SIGNAL(networkDeviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)), this, TQ_SLOT(slotUpdateDeviceState(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString))); } } } @@ -630,7 +630,7 @@ void Tray::disconnectTrayDeviceManager() { TDENetworkConnectionManager* deviceConnMan = foreground_tray_dev->connectionManager(); if (deviceConnMan) { slotUpdateDeviceState(deviceConnMan->deviceStatus().statusFlags, d->foregroundTrayComponent->lastKnownState, TQString()); - disconnect(deviceConnMan, TQT_SIGNAL(networkDeviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)), this, 0); + disconnect(deviceConnMan, TQ_SIGNAL(networkDeviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)), this, 0); } } } @@ -1076,7 +1076,7 @@ Tray::Tray() : KSystemTray() d = new TrayPrivate(this); d->helpMenu = new KHelpMenu(0, TDEGlobal::instance()->aboutData(), false); - connect(&d->signalMapper, TQT_SIGNAL(mapped(int)), this, TQT_SLOT(slotDeactivateConnection(int))); + connect(&d->signalMapper, TQ_SIGNAL(mapped(int)), this, TQ_SLOT(slotDeactivateConnection(int))); setPixmap (m_pixmapCache["tdenetworkmanager"]); setMouseTracking (true); @@ -1084,27 +1084,27 @@ Tray::Tray() : KSystemTray() // Actions used for plugging into the menu new TDEAction (i18n ("Switch to offline mode"), SmallIcon ("no", TQIconSet::Automatic), 0, - this, TQT_SLOT (slotOfflineMode()), actionCollection (), "offline_mode"); + this, TQ_SLOT (slotOfflineMode()), actionCollection (), "offline_mode"); new TDEAction (i18n ("Switch to online mode"), SmallIcon ("ok", TQIconSet::Automatic), 0, - this, TQT_SLOT (slotOnlineMode()), actionCollection (), "online_mode"); + this, TQ_SLOT (slotOnlineMode()), actionCollection (), "online_mode"); new TDEAction (i18n ("Disable Wireless"), SmallIcon ("wireless_off", TQIconSet::Automatic), 0, - this, TQT_SLOT (slotDisableWireless()), actionCollection (), "disable_wireless"); + this, TQ_SLOT (slotDisableWireless()), actionCollection (), "disable_wireless"); new TDEAction (i18n ("Enable Wireless"), SmallIcon ("wireless", TQIconSet::Automatic), 0, - this, TQT_SLOT (slotEnableWireless()), actionCollection (), "enable_wireless"); + this, TQ_SLOT (slotEnableWireless()), actionCollection (), "enable_wireless"); new TDEAction (i18n ("Edit Connections"), SmallIcon ("edit", TQIconSet::Automatic), 0, - this, TQT_SLOT (slotEditConnections()), actionCollection (), "edit_connections"); + this, TQ_SLOT (slotEditConnections()), actionCollection (), "edit_connections"); new TDEAction (i18n ("Configure Notifications"), SmallIcon ("knotify", TQIconSet::Automatic), 0, - this, TQT_SLOT (slotEditNotifications()), actionCollection (), "configure_notifications"); + this, TQ_SLOT (slotEditNotifications()), actionCollection (), "configure_notifications"); // this action is only connected when the menu is shown, hence the 0 receiver new TDEAction (i18n ("New connection ..."), @@ -1120,15 +1120,15 @@ Tray::Tray() : KSystemTray() actionCollection (), "deactivate_menu"); // get notified when NM's state changes - connect(TDEGlobal::networkManager(), TQT_SIGNAL(networkConnectionStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags)), this, TQT_SLOT(slotStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags))); + connect(TDEGlobal::networkManager(), TQ_SIGNAL(networkConnectionStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags)), this, TQ_SLOT(slotStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags))); // get notified about new/removed devices - connect(hwdevices, TQT_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQT_SLOT(slotGenericDeviceAdded(TDEGenericDevice*))); - connect(hwdevices, TQT_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQT_SLOT(slotGenericDeviceRemoved(TDEGenericDevice*))); + connect(hwdevices, TQ_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQ_SLOT(slotGenericDeviceAdded(TDEGenericDevice*))); + connect(hwdevices, TQ_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQ_SLOT(slotGenericDeviceRemoved(TDEGenericDevice*))); // Notifications - connect(TDEGlobal::networkManager(), TQT_SIGNAL(networkConnectionStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags)), this, TQT_SLOT(slotStateChangedNotify(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags))); - connect(TDEGlobal::networkManager(), TQT_SIGNAL(vpnEvent(TDENetworkVPNEventType::TDENetworkVPNEventType, TQString)), this, TQT_SLOT(slotVPNEventHandler(TDENetworkVPNEventType::TDENetworkVPNEventType, TQString))); + connect(TDEGlobal::networkManager(), TQ_SIGNAL(networkConnectionStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags)), this, TQ_SLOT(slotStateChangedNotify(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags))); + connect(TDEGlobal::networkManager(), TQ_SIGNAL(vpnEvent(TDENetworkVPNEventType::TDENetworkVPNEventType, TQString)), this, TQ_SLOT(slotVPNEventHandler(TDENetworkVPNEventType::TDENetworkVPNEventType, TQString))); // Get connection list TDEGlobalNetworkManager* nm = TDEGlobal::networkManager(); diff --git a/tdenetworkmanager/src/tdenetman-wired_device_tray.cpp b/tdenetworkmanager/src/tdenetman-wired_device_tray.cpp index 506317d..c59b614 100644 --- a/tdenetworkmanager/src/tdenetman-wired_device_tray.cpp +++ b/tdenetworkmanager/src/tdenetman-wired_device_tray.cpp @@ -127,13 +127,13 @@ void WiredDeviceTray::addMenuItems(TDEPopupMenu* menu) NetworkMenuItem* item = new NetworkMenuItem(d->dev, conn->UUID, menu); connectionItems += 1; - int id = menu->insertItem(title, item, TQT_SLOT(slotActivate())); + int id = menu->insertItem(title, item, TQ_SLOT(slotActivate())); menu->setItemChecked(id, ((*it) == active_conn)); } if ( connectionItems == 0) { // menu->insertSeparator(); - menu->insertItem(SmallIcon("document-new", TQIconSet::Automatic), i18n("Create new wired connection"), this, TQT_SLOT(newConnection())); + menu->insertItem(SmallIcon("document-new", TQIconSet::Automatic), i18n("Create new wired connection"), this, TQ_SLOT(newConnection())); } // bring the device down diff --git a/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp b/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp index c34c33c..ec1b736 100644 --- a/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp +++ b/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp @@ -195,7 +195,7 @@ void WirelessDeviceTray::addWirelessNetworks(TDEPopupMenu* menu) false); int id = menu->insertItem (wirelessNetworkItem, -1, -1); menu->setItemChecked(id, ((TDENetworkConnection*)(*it) == active_conn)); - menu->connectItem(id, wirelessNetworkItem, TQT_SLOT(slotActivate())); + menu->connectItem(id, wirelessNetworkItem, TQ_SLOT(slotActivate())); } // now add all connections which are not in range to a submenu @@ -225,7 +225,7 @@ void WirelessDeviceTray::addWirelessNetworks(TDEPopupMenu* menu) false); int id = popup->insertItem (wirelessNetworkItem, -1, -1); - popup->connectItem(id, wirelessNetworkItem, TQT_SLOT(slotActivate())); + popup->connectItem(id, wirelessNetworkItem, TQ_SLOT(slotActivate())); networkItemsAdded += 1; } @@ -256,7 +256,7 @@ void WirelessDeviceTray::addWirelessNetworks(TDEPopupMenu* menu) int id = newpopup->insertItem (wirelessNetworkItem, -1, -1); newWirelessPopupSSIDMap[id] = (*it).getSsid(); - newpopup->connectItem(id, this, TQT_SLOT(newConnection(int))); + newpopup->connectItem(id, this, TQ_SLOT(newConnection(int))); newnetworkItemsAdded += 1; } @@ -382,7 +382,7 @@ void WirelessDeviceTray::slotUpdateDeviceState(TDENetworkConnectionStatus::TDENe } // Update tray icon - TQTimer::singleShot(0, this, TQT_SLOT(sendUpdateUI())); + TQTimer::singleShot(0, this, TQ_SLOT(sendUpdateUI())); } void WirelessDeviceTray::slotCheckActiveAccessPoint() @@ -467,7 +467,7 @@ void WirelessDeviceTray::apPropertyChanged(TDEMACAddress BSSID, TDENetworkAPEven { setPixmapForStates(state, "nm_signal_00"); } - TQTimer::singleShot(0, this, TQT_SLOT(sendUpdateUI())); + TQTimer::singleShot(0, this, TQ_SLOT(sendUpdateUI())); } } } @@ -538,10 +538,10 @@ WirelessDeviceTray::WirelessDeviceTray (TQString dev, KSystemTray * parent, cons TDENetworkConnectionManager* deviceConnMan = (netdev)?netdev->connectionManager():NULL; // get notified when the device state changes - connect(deviceConnMan, TQT_SIGNAL(networkDeviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)), this, TQT_SLOT(slotUpdateDeviceState(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString))); + connect(deviceConnMan, TQ_SIGNAL(networkDeviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)), this, TQ_SLOT(slotUpdateDeviceState(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString))); // get notified of all AP changes - connect(deviceConnMan, TQT_SIGNAL(accessPointStatusChanged(TDEMACAddress, TDENetworkAPEventType::TDENetworkAPEventType)), this, TQT_SLOT(tdeAccessPointStatusChangedHandler(TDEMACAddress, TDENetworkAPEventType::TDENetworkAPEventType))); + connect(deviceConnMan, TQ_SIGNAL(accessPointStatusChanged(TDEMACAddress, TDENetworkAPEventType::TDENetworkAPEventType)), this, TQ_SLOT(tdeAccessPointStatusChangedHandler(TDEMACAddress, TDENetworkAPEventType::TDENetworkAPEventType))); // force status update to ensure correct icon is shown on startup if ((netdev) && (deviceConnMan)) { diff --git a/tdenetworkmanager/src/tdenetman.cpp b/tdenetworkmanager/src/tdenetman.cpp index 4da1bfc..996e0e4 100644 --- a/tdenetworkmanager/src/tdenetman.cpp +++ b/tdenetworkmanager/src/tdenetman.cpp @@ -78,7 +78,7 @@ TDENetworkManager::TDENetworkManager() : KUniqueApplication() d->_ctx = this; // we need to get informed when shutting down - connect(this, TQT_SIGNAL(shutDown()), this, TQT_SLOT(slotShutDown())); + connect(this, TQ_SIGNAL(shutDown()), this, TQ_SLOT(slotShutDown())); // create the main-tray-icon Tray* tray = Tray::getInstance(); diff --git a/tdenetworkmanager/src/vpn_tray_component.cpp b/tdenetworkmanager/src/vpn_tray_component.cpp index 9830d3c..448bbd7 100644 --- a/tdenetworkmanager/src/vpn_tray_component.cpp +++ b/tdenetworkmanager/src/vpn_tray_component.cpp @@ -109,7 +109,7 @@ void VPNTrayComponent::addMenuItems(TDEPopupMenu* menu) printf("Active VPN connection found\n"); } else { - popup->insertItem(SmallIcon ("encrypted", TQIconSet::Automatic), title, item, TQT_SLOT(slotActivate())); + popup->insertItem(SmallIcon ("encrypted", TQIconSet::Automatic), title, item, TQ_SLOT(slotActivate())); inactive_vpn_connections++; } @@ -185,12 +185,12 @@ VPNTrayComponent::VPNTrayComponent (KSystemTray * parent, const char * name ) TDEGlobalNetworkManager* nm = TDEGlobal::networkManager(); // Monitor VPN messages - connect(nm, SIGNAL(vpnEvent(TDENetworkVPNEventType::TDENetworkVPNEventType, TQString)), this, SLOT(vpnEventHandler(TDENetworkVPNEventType::TDENetworkVPNEventType, TQString))); + connect(nm, TQ_SIGNAL(vpnEvent(TDENetworkVPNEventType::TDENetworkVPNEventType, TQString)), this, TQ_SLOT(vpnEventHandler(TDENetworkVPNEventType::TDENetworkVPNEventType, TQString))); //Actions used for plugging into the menu new TDEAction (i18n ("New connection ..."), SmallIcon ("encrypted", TQIconSet::Automatic), 0, - this, TQT_SLOT (slotShowNewConnectionDialog()), parent->actionCollection (), "create_new_vpn_connection"); + this, TQ_SLOT (slotShowNewConnectionDialog()), parent->actionCollection (), "create_new_vpn_connection"); } VPNTrayComponent::~VPNTrayComponent () diff --git a/tdenetworkmanager/vpn-plugins/openvpn/src/tdenetman-openvpn.cpp b/tdenetworkmanager/vpn-plugins/openvpn/src/tdenetman-openvpn.cpp index 4f153c9..15ea640 100644 --- a/tdenetworkmanager/vpn-plugins/openvpn/src/tdenetman-openvpn.cpp +++ b/tdenetworkmanager/vpn-plugins/openvpn/src/tdenetman-openvpn.cpp @@ -111,16 +111,16 @@ OpenVPNConfig::OpenVPNConfig(TQWidget* parent) _openvpnWidget = new OpenVPNConfigWidget(this); layout->addWidget(_openvpnWidget); - connect(_openvpnWidget->chkUseCipher, TQT_SIGNAL(toggled(bool)), _openvpnWidget->cboCipher, TQT_SLOT(setEnabled(bool))); - connect(_openvpnWidget->chkUseTLS, TQT_SIGNAL(toggled(bool)), _openvpnWidget->cboDirection, TQT_SLOT(setEnabled(bool))); - connect(_openvpnWidget->chkUseTLS, TQT_SIGNAL(toggled(bool)), _openvpnWidget->editTLSAuth, TQT_SLOT(setEnabled(bool))); - connect(_openvpnWidget->chkIPAdresses, TQT_SIGNAL(toggled(bool)), _openvpnWidget->routes, TQT_SLOT(setEnabled(bool))); + connect(_openvpnWidget->chkUseCipher, TQ_SIGNAL(toggled(bool)), _openvpnWidget->cboCipher, TQ_SLOT(setEnabled(bool))); + connect(_openvpnWidget->chkUseTLS, TQ_SIGNAL(toggled(bool)), _openvpnWidget->cboDirection, TQ_SLOT(setEnabled(bool))); + connect(_openvpnWidget->chkUseTLS, TQ_SIGNAL(toggled(bool)), _openvpnWidget->editTLSAuth, TQ_SLOT(setEnabled(bool))); + connect(_openvpnWidget->chkIPAdresses, TQ_SIGNAL(toggled(bool)), _openvpnWidget->routes, TQ_SLOT(setEnabled(bool))); // add all Cipher modes to the Combobox getCipherModes(); // switch to the right configuration interface when selecting the connection type - connect(_openvpnWidget->cboConnectionType, TQT_SIGNAL( activated(int)), _openvpnWidget->widgetStack, TQT_SLOT(raiseWidget(int))); + connect(_openvpnWidget->cboConnectionType, TQ_SIGNAL( activated(int)), _openvpnWidget->widgetStack, TQ_SLOT(raiseWidget(int))); this->languageChange(); } @@ -180,7 +180,7 @@ void OpenVPNConfig::getCipherModes() TDEProcess* cipherHelper = new TDEProcess(); cipherHelper->setUseShell(true, "/bin/sh"); *cipherHelper << TQString::fromLatin1("%1 --show-ciphers | awk '/^[A-Z][A-Z0-9]+-/ { print $1 }'").arg(openvpn); - connect (cipherHelper, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), this, TQT_SLOT(receiveCipherData(TDEProcess*, char*, int))); + connect (cipherHelper, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), this, TQ_SLOT(receiveCipherData(TDEProcess*, char*, int))); kdDebug() << "starting openvpn to get cipher modes" << endl; if (!cipherHelper->start(TDEProcess::Block, TDEProcess::Stdout)) { kdDebug() << "error starting openvpn" << endl; diff --git a/tdenetworkmanager/vpn-plugins/pptp/src/tdenetman-pptp.cpp b/tdenetworkmanager/vpn-plugins/pptp/src/tdenetman-pptp.cpp index 9231d86..98592d7 100644 --- a/tdenetworkmanager/vpn-plugins/pptp/src/tdenetman-pptp.cpp +++ b/tdenetworkmanager/vpn-plugins/pptp/src/tdenetman-pptp.cpp @@ -71,7 +71,7 @@ PPTPConfig::PPTPConfig(TQWidget* parent) _pptpWidget = new PPTPConfigWidget(this); layout->addWidget(_pptpWidget); - connect(_pptpWidget->chkIPAdresses, TQT_SIGNAL(toggled(bool)), _pptpWidget->routes, TQT_SLOT(setEnabled(bool))); + connect(_pptpWidget->chkIPAdresses, TQ_SIGNAL(toggled(bool)), _pptpWidget->routes, TQ_SLOT(setEnabled(bool))); this->languageChange(); } diff --git a/tdenetworkmanager/vpn-plugins/vpnc/src/tdenetman-vpnc.cpp b/tdenetworkmanager/vpn-plugins/vpnc/src/tdenetman-vpnc.cpp index c5fad17..9084af1 100644 --- a/tdenetworkmanager/vpn-plugins/vpnc/src/tdenetman-vpnc.cpp +++ b/tdenetworkmanager/vpn-plugins/vpnc/src/tdenetman-vpnc.cpp @@ -82,18 +82,18 @@ VPNCConfig::VPNCConfig(TQWidget* parent) _vpncWidget = new VPNCConfigWidget(this); layout->addWidget(_vpncWidget); - connect(_vpncWidget->pcfImport, TQT_SIGNAL(clicked()), this, TQT_SLOT( pcfImport()) ); + connect(_vpncWidget->pcfImport, TQ_SIGNAL(clicked()), this, TQ_SLOT( pcfImport()) ); - //connect(_vpncWidget->chkOverrideUsername, TQT_SIGNAL(toggled(bool)), _vpncWidget->Xauth_username, TQT_SLOT(setEnabled(bool))); - //connect(_vpncWidget->chkOverrideUsername, TQT_SIGNAL(toggled(bool)), _vpncWidget->lblUsername, TQT_SLOT(setEnabled(bool))); + //connect(_vpncWidget->chkOverrideUsername, TQ_SIGNAL(toggled(bool)), _vpncWidget->Xauth_username, TQ_SLOT(setEnabled(bool))); + //connect(_vpncWidget->chkOverrideUsername, TQ_SIGNAL(toggled(bool)), _vpncWidget->lblUsername, TQ_SLOT(setEnabled(bool))); - connect(_vpncWidget->chkUseDomain, TQT_SIGNAL(toggled(bool)), _vpncWidget->Domain, TQT_SLOT(setEnabled(bool))); - connect(_vpncWidget->chkUseDomain, TQT_SIGNAL(toggled(bool)), _vpncWidget->lblDomain, TQT_SLOT(setEnabled(bool))); + connect(_vpncWidget->chkUseDomain, TQ_SIGNAL(toggled(bool)), _vpncWidget->Domain, TQ_SLOT(setEnabled(bool))); + connect(_vpncWidget->chkUseDomain, TQ_SIGNAL(toggled(bool)), _vpncWidget->lblDomain, TQ_SLOT(setEnabled(bool))); - connect(_vpncWidget->chkIPAdresses, TQT_SIGNAL(toggled(bool)), _vpncWidget->routes, TQT_SLOT(setEnabled(bool))); + connect(_vpncWidget->chkIPAdresses, TQ_SIGNAL(toggled(bool)), _vpncWidget->routes, TQ_SLOT(setEnabled(bool))); - connect(_vpncWidget->chkUseKeepAlive, TQT_SIGNAL(toggled(bool)), _vpncWidget->nat_keep_alive_interval, TQT_SLOT(setEnabled(bool))); - connect(_vpncWidget->chkUseKeepAlive, TQT_SIGNAL(toggled(bool)), _vpncWidget->lblKeepAliveInterval, TQT_SLOT(setEnabled(bool))); + connect(_vpncWidget->chkUseKeepAlive, TQ_SIGNAL(toggled(bool)), _vpncWidget->nat_keep_alive_interval, TQ_SLOT(setEnabled(bool))); + connect(_vpncWidget->chkUseKeepAlive, TQ_SIGNAL(toggled(bool)), _vpncWidget->lblKeepAliveInterval, TQ_SLOT(setEnabled(bool))); _vpncWidget->cboNAT->insertItem(i18n("Cisco UDP (default)"), NAT_MODE_CISCO); _vpncWidget->cboNAT->insertItem(i18n("NAT-T"), NAT_MODE_NATT);