summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-21 14:05:06 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-21 14:05:06 -0600
commit937ea2b932e5157f79470a4d191e12baab2b6042 (patch)
tree9bfcd52ab1927133be8e427475d611834cbece75
parentaa76ad73287dfdb114ee6959bc633eafdb7470b7 (diff)
downloadknetworkmanager8-937ea2b932e5157f79470a4d191e12baab2b6042.tar.gz
knetworkmanager8-937ea2b932e5157f79470a4d191e12baab2b6042.zip
Rename obsolete tq methods to standard names
-rw-r--r--knetworkmanager-0.8/src/connection_setting_cdma.ui2
-rw-r--r--knetworkmanager-0.8/src/connection_setting_gsm.ui2
-rw-r--r--knetworkmanager-0.8/src/connection_setting_ppp.ui12
-rw-r--r--knetworkmanager-0.8/src/connection_setting_serial.ui2
-rw-r--r--knetworkmanager-0.8/src/knetworkmanager-connection_setting_cdma_widget.cpp4
-rw-r--r--knetworkmanager-0.8/src/knetworkmanager-connection_setting_gsm_widget.cpp4
-rw-r--r--knetworkmanager-0.8/src/knetworkmanager-connection_setting_info_widget.cpp4
-rw-r--r--knetworkmanager-0.8/src/knetworkmanager-connection_setting_ipv4_widget.cpp4
-rw-r--r--knetworkmanager-0.8/src/knetworkmanager-connection_setting_ppp_widget.cpp4
-rw-r--r--knetworkmanager-0.8/src/knetworkmanager-connection_setting_serial_widget.cpp4
-rw-r--r--knetworkmanager-0.8/src/knetworkmanager-connection_setting_vpn_widget.cpp4
-rw-r--r--knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless_security_widget.cpp16
-rw-r--r--knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless_widget.cpp8
-rw-r--r--knetworkmanager-0.8/src/knetworkmanager-wireless_menuitem.cpp14
-rw-r--r--knetworkmanager-0.8/vpn-plugins/openvpn/src/knetworkmanager-openvpn.cpp8
-rw-r--r--knetworkmanager-0.8/vpn-plugins/pptp/src/knetworkmanager-pptp.cpp8
-rw-r--r--knetworkmanager-0.8/vpn-plugins/strongswan/src/knetworkmanager-strongswan.cpp8
-rw-r--r--knetworkmanager-0.8/vpn-plugins/vpnc/src/knetworkmanager-vpnc.cpp8
18 files changed, 58 insertions, 58 deletions
diff --git a/knetworkmanager-0.8/src/connection_setting_cdma.ui b/knetworkmanager-0.8/src/connection_setting_cdma.ui
index af1d3e6..5674468 100644
--- a/knetworkmanager-0.8/src/connection_setting_cdma.ui
+++ b/knetworkmanager-0.8/src/connection_setting_cdma.ui
@@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout10</cstring>
+ <cstring>layout10</cstring>
</property>
<grid>
<property name="name">
diff --git a/knetworkmanager-0.8/src/connection_setting_gsm.ui b/knetworkmanager-0.8/src/connection_setting_gsm.ui
index 3809673..c89a749 100644
--- a/knetworkmanager-0.8/src/connection_setting_gsm.ui
+++ b/knetworkmanager-0.8/src/connection_setting_gsm.ui
@@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout9</cstring>
+ <cstring>layout9</cstring>
</property>
<grid>
<property name="name">
diff --git a/knetworkmanager-0.8/src/connection_setting_ppp.ui b/knetworkmanager-0.8/src/connection_setting_ppp.ui
index 4f051a7..7db6e5e 100644
--- a/knetworkmanager-0.8/src/connection_setting_ppp.ui
+++ b/knetworkmanager-0.8/src/connection_setting_ppp.ui
@@ -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">
diff --git a/knetworkmanager-0.8/src/connection_setting_serial.ui b/knetworkmanager-0.8/src/connection_setting_serial.ui
index ef2fec4..2a3b9ad 100644
--- a/knetworkmanager-0.8/src/connection_setting_serial.ui
+++ b/knetworkmanager-0.8/src/connection_setting_serial.ui
@@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout23</cstring>
+ <cstring>layout23</cstring>
</property>
<grid>
<property name="name">
diff --git a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_cdma_widget.cpp b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_cdma_widget.cpp
index b637b70..b09fea9 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_cdma_widget.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_cdma_widget.cpp
@@ -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();
}
diff --git a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_gsm_widget.cpp b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_gsm_widget.cpp
index c43f4ad..88af9bb 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_gsm_widget.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_gsm_widget.cpp
@@ -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();
}
diff --git a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_info_widget.cpp b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_info_widget.cpp
index a97e0c0..e0982e8 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_info_widget.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_info_widget.cpp
@@ -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();
}
diff --git a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_ipv4_widget.cpp b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_ipv4_widget.cpp
index e43d646..ca00a49 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_ipv4_widget.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_ipv4_widget.cpp
@@ -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();
}
diff --git a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_ppp_widget.cpp b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_ppp_widget.cpp
index 4dff5ce..e735969 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_ppp_widget.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_ppp_widget.cpp
@@ -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();
}
diff --git a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_serial_widget.cpp b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_serial_widget.cpp
index bdb2f82..87b92db 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_serial_widget.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_serial_widget.cpp
@@ -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();
}
diff --git a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_vpn_widget.cpp b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_vpn_widget.cpp
index 913996a..0e9ac95 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_vpn_widget.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_vpn_widget.cpp
@@ -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();
}
diff --git a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless_security_widget.cpp b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless_security_widget.cpp
index 5f508fc..1adea03 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless_security_widget.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless_security_widget.cpp
@@ -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();
}
}
diff --git a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless_widget.cpp b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless_widget.cpp
index b2275ce..e6bd9c2 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless_widget.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless_widget.cpp
@@ -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)) );
diff --git a/knetworkmanager-0.8/src/knetworkmanager-wireless_menuitem.cpp b/knetworkmanager-0.8/src/knetworkmanager-wireless_menuitem.cpp
index 6426474..87145cb 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-wireless_menuitem.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-wireless_menuitem.cpp
@@ -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 ++;
diff --git a/knetworkmanager-0.8/vpn-plugins/openvpn/src/knetworkmanager-openvpn.cpp b/knetworkmanager-0.8/vpn-plugins/openvpn/src/knetworkmanager-openvpn.cpp
index bfb5349..020df5a 100644
--- a/knetworkmanager-0.8/vpn-plugins/openvpn/src/knetworkmanager-openvpn.cpp
+++ b/knetworkmanager-0.8/vpn-plugins/openvpn/src/knetworkmanager-openvpn.cpp
@@ -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()
diff --git a/knetworkmanager-0.8/vpn-plugins/pptp/src/knetworkmanager-pptp.cpp b/knetworkmanager-0.8/vpn-plugins/pptp/src/knetworkmanager-pptp.cpp
index 091b400..452fb23 100644
--- a/knetworkmanager-0.8/vpn-plugins/pptp/src/knetworkmanager-pptp.cpp
+++ b/knetworkmanager-0.8/vpn-plugins/pptp/src/knetworkmanager-pptp.cpp
@@ -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()
diff --git a/knetworkmanager-0.8/vpn-plugins/strongswan/src/knetworkmanager-strongswan.cpp b/knetworkmanager-0.8/vpn-plugins/strongswan/src/knetworkmanager-strongswan.cpp
index 37cee81..39a512c 100644
--- a/knetworkmanager-0.8/vpn-plugins/strongswan/src/knetworkmanager-strongswan.cpp
+++ b/knetworkmanager-0.8/vpn-plugins/strongswan/src/knetworkmanager-strongswan.cpp
@@ -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()
diff --git a/knetworkmanager-0.8/vpn-plugins/vpnc/src/knetworkmanager-vpnc.cpp b/knetworkmanager-0.8/vpn-plugins/vpnc/src/knetworkmanager-vpnc.cpp
index 5a35177..5bab84c 100644
--- a/knetworkmanager-0.8/vpn-plugins/vpnc/src/knetworkmanager-vpnc.cpp
+++ b/knetworkmanager-0.8/vpn-plugins/vpnc/src/knetworkmanager-vpnc.cpp
@@ -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()