From 43b12e2e89ff2531ae5af4103346a793348a4e1d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:56:24 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit def182a745c9f7c9f91600c31d133389d0d59b82. --- .../knetworkmanager-connection_setting_wireless_widget.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless_widget.cpp') 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 888e169..3cf6a9f 100644 --- a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless_widget.cpp +++ b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless_widget.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include @@ -51,7 +51,7 @@ class NetworkListViewItem : public KListViewItem public: NetworkListViewItem(TQListView* parent, WirelessNetwork& net) - : KListViewItem(parent, TQString::fromUtf8(net.getDisplaySsid()), TQString("%1\%").arg(net.getStrength())) + : KListViewItem(parent, TQString::fromUtf8(net.getDisplaySsid()), TQString("%1\%").tqarg(net.getStrength())) , _net(net) { TQ_UINT8 strength = net.getStrength(); @@ -82,9 +82,9 @@ WirelessWidgetImpl::WirelessWidgetImpl(Connection* conn, bool new_conn, TQWidget _hasName = !_info_setting->getName().isEmpty(); _new_conn = new_conn; - TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1); + TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 1, 1); _mainWid = new ConnectionSettingWirelessWidget(this); - layout->addWidget(_mainWid); + tqlayout->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* layout = new TQVBoxLayout(_mainWid->framePlaceholder, 1, 1); + TQVBoxLayout* tqlayout = new TQVBoxLayout(_mainWid->framePlaceholder, 1, 1); _searchLine = new KListViewSearchLineWidget(_mainWid->lvEssids, _mainWid->framePlaceholder); - layout->addWidget(_searchLine); + tqlayout->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)) ); -- cgit v1.2.1