Rename obsolete tq methods to standard names

(cherry picked from commit 937ea2b932)
v3.5.13-sru
Timothy Pearson 13 years ago committed by Slávek Banko
parent 663f2b31dd
commit 95d0b7a34b

@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout10</cstring>
<cstring>layout10</cstring>
</property>
<grid>
<property name="name">

@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout9</cstring>
<cstring>layout9</cstring>
</property>
<grid>
<property name="name">

@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout9</cstring>
<cstring>layout9</cstring>
</property>
<grid>
<property name="name">
@ -57,7 +57,7 @@
</spacer>
<widget class="TQLayoutWidget" row="4" column="2">
<property name="name">
<cstring>tqlayout11</cstring>
<cstring>layout11</cstring>
</property>
<hbox>
<property name="name">
@ -80,7 +80,7 @@
</widget>
<widget class="TQLayoutWidget" row="3" column="2">
<property name="name">
<cstring>tqlayout12</cstring>
<cstring>layout12</cstring>
</property>
<hbox>
<property name="name">
@ -103,7 +103,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="2">
<property name="name">
<cstring>tqlayout15</cstring>
<cstring>layout15</cstring>
</property>
<hbox>
<property name="name">
@ -126,7 +126,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="2">
<property name="name">
<cstring>tqlayout13</cstring>
<cstring>layout13</cstring>
</property>
<hbox>
<property name="name">
@ -181,7 +181,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="2">
<property name="name">
<cstring>tqlayout14</cstring>
<cstring>layout14</cstring>
</property>
<hbox>
<property name="name">

@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout23</cstring>
<cstring>layout23</cstring>
</property>
<grid>
<property name="name">

@ -48,9 +48,9 @@ CDMAWidgetImpl::CDMAWidgetImpl(Connection* conn, TQWidget* parent, const char* n
{
_cdmasetting = dynamic_cast<ConnectionSettings::CDMA*> (conn->getSetting(NM_SETTING_CDMA_SETTING_NAME));
TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 1, 1);
TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1);
_mainWid = new ConnectionSettingCdmaWidget(this);
tqlayout->addWidget(_mainWid);
layout->addWidget(_mainWid);
Init();
}

@ -49,9 +49,9 @@ GSMWidgetImpl::GSMWidgetImpl(Connection* conn, TQWidget* parent, const char* nam
{
_gsmsetting = dynamic_cast<ConnectionSettings::GSM*> (conn->getSetting(NM_SETTING_GSM_SETTING_NAME));
TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 1, 1);
TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1);
_mainWid = new ConnectionSettingGsmWidget(this);
tqlayout->addWidget(_mainWid);
layout->addWidget(_mainWid);
Init();
}

@ -43,9 +43,9 @@ InfoWidgetImpl::InfoWidgetImpl(Connection* conn, TQWidget* parent, const char* n
_infosetting = dynamic_cast<ConnectionSettings::Info*> (conn->getSetting(NM_SETTING_CONNECTION_SETTING_NAME));
TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 1, 1);
TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1);
_mainWid = new ConnectionSettingInfoWidget(this);
tqlayout->addWidget(_mainWid);
layout->addWidget(_mainWid);
Init();
}

@ -41,9 +41,9 @@ IPv4WidgetImpl::IPv4WidgetImpl(Connection* conn, TQWidget* parent, const char* n
{
_ipv4_setting = dynamic_cast<ConnectionSettings::IPv4*> (conn->getSetting(NM_SETTING_IP4_CONFIG_SETTING_NAME));
TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 1, 1);
TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1);
_mainWid = new ConnectionSettingIPv4Widget(this);
tqlayout->addWidget(_mainWid);
layout->addWidget(_mainWid);
Init();
}

@ -51,9 +51,9 @@ PPPWidgetImpl::PPPWidgetImpl(Connection* conn, TQWidget* parent, const char* nam
{
_pppsetting = dynamic_cast<ConnectionSettings::PPP*> (conn->getSetting(NM_SETTING_PPP_SETTING_NAME));
TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 1, 1);
TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1);
_mainWid = new ConnectionSettingPppWidget(this);
tqlayout->addWidget(_mainWid);
layout->addWidget(_mainWid);
Init();
}

@ -50,9 +50,9 @@ SerialWidgetImpl::SerialWidgetImpl(Connection* conn, TQWidget* parent, const cha
{
_serialsetting = dynamic_cast<ConnectionSettings::Serial*> (conn->getSetting(NM_SETTING_SERIAL_SETTING_NAME));
TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 1, 1);
TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1);
_mainWid = new ConnectionSettingSerialWidget(this);
tqlayout->addWidget(_mainWid);
layout->addWidget(_mainWid);
_mainWid->mBaudRate->setMaxValue(INT_MAX);
Init();
}

@ -50,9 +50,9 @@ VPNWidgetImpl::VPNWidgetImpl(Connection* conn, bool new_conn, TQWidget* parent,
{
_vpnsetting = dynamic_cast<ConnectionSettings::VPN*> (conn->getSetting(NM_SETTING_VPN_SETTING_NAME));
TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 1, 1);
TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1);
_mainWid = new ConnectionSettingVPNWidget(this);
tqlayout->addWidget(_mainWid);
layout->addWidget(_mainWid);
Init();
}

@ -664,9 +664,9 @@ WirelessSecurityWidgetImpl::WirelessSecurityWidgetImpl(Connection* conn, bool ne
_ieee8021x_setting = dynamic_cast<IEEE8021x*> (conn->getSetting(NM_SETTING_802_1X_SETTING_NAME));
_new_conn = new_conn;
TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 1, 1);
TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1);
_mainWid = new ConnectionSettingWirelessSecurityWidget(this);
tqlayout->addWidget(_mainWid);
layout->addWidget(_mainWid);
TQTimer::singleShot(0, this, TQT_SLOT(slotInit()));
}
@ -918,13 +918,13 @@ WirelessSecurityWidgetImpl::configureWidgets(SecurityMethods method)
{
for (TQValueList<TQWidget*>::iterator it = _widgets[i].begin(); it != _widgets[i].end(); ++it)
{
_mainWid->groupUseEncryption->tqlayout()->remove(*it);
_mainWid->groupUseEncryption->layout()->remove(*it);
(*it)->hide();
}
// remove extra widgets too
for (TQValueList<TQWidget*>::iterator it = _extra_widgets[i].begin(); it != _extra_widgets[i].end(); ++it)
{
_mainWid->groupUseEncryption->tqlayout()->remove(*it);
_mainWid->groupUseEncryption->layout()->remove(*it);
(*it)->hide();
}
}
@ -933,14 +933,14 @@ WirelessSecurityWidgetImpl::configureWidgets(SecurityMethods method)
// show all widgets widgets for the selected security method
for (TQValueList<TQWidget*>::iterator it = _widgets[method].begin(); it != _widgets[method].end(); ++it)
{
_mainWid->groupUseEncryption->tqlayout()->add(*it);
_mainWid->groupUseEncryption->layout()->add(*it);
(*it)->show();
}
if (_mainWid->pbExtra->isOn())
for (TQValueList<TQWidget*>::iterator it = _extra_widgets[method].begin(); it != _extra_widgets[method].end(); ++it)
{
_mainWid->groupUseEncryption->tqlayout()->add(*it);
_mainWid->groupUseEncryption->layout()->add(*it);
(*it)->show();
}
@ -954,13 +954,13 @@ WirelessSecurityWidgetImpl::slotExtraSettingsToggled(bool on)
if (on)
for (TQValueList<TQWidget*>::iterator it = _extra_widgets[_currentMethod].begin(); it != _extra_widgets[_currentMethod].end(); ++it)
{
_mainWid->groupUseEncryption->tqlayout()->add(*it);
_mainWid->groupUseEncryption->layout()->add(*it);
(*it)->show();
}
else
for (TQValueList<TQWidget*>::iterator it = _extra_widgets[_currentMethod].begin(); it != _extra_widgets[_currentMethod].end(); ++it)
{
_mainWid->groupUseEncryption->tqlayout()->remove(*it);
_mainWid->groupUseEncryption->layout()->remove(*it);
(*it)->hide();
}
}

@ -82,9 +82,9 @@ WirelessWidgetImpl::WirelessWidgetImpl(Connection* conn, bool new_conn, TQWidget
_hasName = !_info_setting->getName().isEmpty();
_new_conn = new_conn;
TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 1, 1);
TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1);
_mainWid = new ConnectionSettingWirelessWidget(this);
tqlayout->addWidget(_mainWid);
layout->addWidget(_mainWid);
// FIXME hide this button until it is implemented
_mainWid->pbExpert->hide();
@ -95,9 +95,9 @@ WirelessWidgetImpl::WirelessWidgetImpl(Connection* conn, bool new_conn, TQWidget
void
WirelessWidgetImpl::Init()
{
TQVBoxLayout* tqlayout = new TQVBoxLayout(_mainWid->framePlaceholder, 1, 1);
TQVBoxLayout* layout = new TQVBoxLayout(_mainWid->framePlaceholder, 1, 1);
_searchLine = new KListViewSearchLineWidget(_mainWid->lvEssids, _mainWid->framePlaceholder);
tqlayout->addWidget(_searchLine);
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)) );

@ -124,7 +124,7 @@ WirelessNetworkItem::paint (TQPainter *p, const TQColorGroup &/*cg*/, bool highl
p->setPen(parent->tqpalette ().active ().highlightedText ());
pbarStrength->setBackgroundMode( TQt::PaletteHighlight, TQt::PaletteHighlight );
} else {
p->setPen(parent->tqpalette ().active ().text ());
p->setPen(parent->palette ().active ().text ());
}
p->drawText (x, y, w, h, AlignLeft | AlignVCenter | DontClip | ShowPrefix, getDisplayText());
@ -169,7 +169,7 @@ WirelessNetworkItem::WirelessNetworkItem (TQWidget* p, Device* dev, WirelessNetw
// figure out the height of the text
_textHeight = kapp->fontMetrics ().size (AlignLeft | AlignVCenter | DontClip | ShowPrefix, _net.getDisplaySsid()).height ();
// the item is height of the text plus the default frame width
_height = _textHeight + kapp->tqstyle ().pixelMetric (TQStyle::PM_DefaultFrameWidth);
_height = _textHeight + kapp->style ().pixelMetric (TQStyle::PM_DefaultFrameWidth);
/* _height needs to be at least the height of a SmallIcon plus a border of one px (top & bottom)*/
if (_height < _widgetHeight) {
_height = _widgetHeight + 2;
@ -177,8 +177,8 @@ WirelessNetworkItem::WirelessNetworkItem (TQWidget* p, Device* dev, WirelessNetw
/* border required for pmLock and pbarStrength */
_border = 1;
if (_border == kapp->tqstyle ().pixelMetric (TQStyle::PM_DefaultFrameWidth))
_border += 2 * kapp->tqstyle ().pixelMetric (TQStyle::PM_DefaultFrameWidth);
if (_border == kapp->style ().pixelMetric (TQStyle::PM_DefaultFrameWidth))
_border += 2 * kapp->style ().pixelMetric (TQStyle::PM_DefaultFrameWidth);
if (_border == 0)
_border ++;
@ -209,7 +209,7 @@ WirelessNetworkItem::WirelessNetworkItem (TQWidget* p, Device* dev, WirelessNetw
// figure out the height of the text
_textHeight = kapp->fontMetrics ().size (AlignLeft | AlignVCenter | DontClip | ShowPrefix, _net.getDisplaySsid()).height ();
// the item is height of the text plus the default frame width
_height = _textHeight + kapp->tqstyle ().pixelMetric (TQStyle::PM_DefaultFrameWidth);
_height = _textHeight + kapp->style ().pixelMetric (TQStyle::PM_DefaultFrameWidth);
/* _height needs to be at least the height of a SmallIcon plus a border of one px (top & bottom)*/
if (_height < _widgetHeight) {
_height = _widgetHeight + 2;
@ -217,8 +217,8 @@ WirelessNetworkItem::WirelessNetworkItem (TQWidget* p, Device* dev, WirelessNetw
/* border required for pmLock and pbarStrength */
_border = 1;
if (_border == kapp->tqstyle ().pixelMetric (TQStyle::PM_DefaultFrameWidth))
_border += 2 * kapp->tqstyle ().pixelMetric (TQStyle::PM_DefaultFrameWidth);
if (_border == kapp->style ().pixelMetric (TQStyle::PM_DefaultFrameWidth))
_border += 2 * kapp->style ().pixelMetric (TQStyle::PM_DefaultFrameWidth);
if (_border == 0)
_border ++;

@ -108,9 +108,9 @@ int OpenVPNConnectionType::mapConnectionType2String(CONNECTIONTYPE connType)
OpenVPNConfig::OpenVPNConfig(TQWidget* parent)
: VPNConfigWidget(parent)
{
TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 1, 1);
TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1);
_openvpnWidget = new OpenVPNConfigWidget(this);
tqlayout->addWidget(_openvpnWidget);
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)));
@ -516,9 +516,9 @@ bool OpenVPNConfig::isValid(TQStringList& err_msg)
OpenVPNAuthentication::OpenVPNAuthentication(TQWidget* parent, char* name)
: VPNAuthenticationWidget(parent, name)
{
TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 1, 1);
TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1);
_openvpnAuth = new OpenVPNAuthenticationWidget(this);
tqlayout->addWidget(_openvpnAuth);
layout->addWidget(_openvpnAuth);
}
OpenVPNAuthentication::~OpenVPNAuthentication()

@ -67,9 +67,9 @@ VPNAuthenticationWidget* PPTPPlugin::CreateAuthenticationWidget(TQWidget* parent
PPTPConfig::PPTPConfig(TQWidget* parent)
: VPNConfigWidget(parent)
{
TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 1, 1);
TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1);
_pptpWidget = new PPTPConfigWidget(this);
tqlayout->addWidget(_pptpWidget);
layout->addWidget(_pptpWidget);
connect(_pptpWidget->chkIPAdresses, TQT_SIGNAL(toggled(bool)), _pptpWidget->routes, TQT_SLOT(setEnabled(bool)));
@ -201,9 +201,9 @@ bool PPTPConfig::isValid(TQStringList& err_msg)
PPTPAuthentication::PPTPAuthentication(TQWidget* parent, char* name)
: VPNAuthenticationWidget(parent, name)
{
TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 1, 1);
TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1);
_pptpAuth = new PPTPAuthenticationWidget(this);
tqlayout->addWidget(_pptpAuth);
layout->addWidget(_pptpAuth);
}
PPTPAuthentication::~PPTPAuthentication()

@ -67,9 +67,9 @@ VPNAuthenticationWidget* StrongswanPlugin::CreateAuthenticationWidget(TQWidget*
StrongswanConfig::StrongswanConfig(TQWidget* parent)
: VPNConfigWidget(parent)
{
TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 1, 1);
TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1);
_strongswanWidget = new StrongswanConfigWidget(this);
tqlayout->addWidget(_strongswanWidget);
layout->addWidget(_strongswanWidget);
/* TODO not sure if we need this here */
this->languageChange();
@ -208,9 +208,9 @@ bool StrongswanConfig::isValid(TQStringList& err_msg)
StrongswanAuthentication::StrongswanAuthentication(TQWidget* parent, char* name)
: VPNAuthenticationWidget(parent, name)
{
TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 1, 1);
TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1);
_strongswanAuth = new StrongswanAuthenticationWidget(this);
tqlayout->addWidget(_strongswanAuth);
layout->addWidget(_strongswanAuth);
}
StrongswanAuthentication::~StrongswanAuthentication()

@ -77,9 +77,9 @@ VPNAuthenticationWidget* VPNCPlugin::CreateAuthenticationWidget(TQWidget* parent
VPNCConfig::VPNCConfig(TQWidget* parent)
: VPNConfigWidget(parent)
{
TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 1, 1);
TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1);
_vpncWidget = new VPNCConfigWidget(this);
tqlayout->addWidget(_vpncWidget);
layout->addWidget(_vpncWidget);
connect(_vpncWidget->pcfImport, TQT_SIGNAL(clicked()), this, TQT_SLOT( pcfImport()) );
@ -344,9 +344,9 @@ bool VPNCConfig::isValid(TQStringList& err_msg)
VPNCAuthentication::VPNCAuthentication(TQWidget* parent, char* name)
: VPNAuthenticationWidget(parent, name)
{
TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 1, 1);
TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1);
_vpncAuth = new VPNCAuthenticationWidget(this);
tqlayout->addWidget(_vpncAuth);
layout->addWidget(_vpncAuth);
}
VPNCAuthentication::~VPNCAuthentication()

Loading…
Cancel
Save