diff options
author | Timothy Pearson <[email protected]> | 2011-12-19 11:37:22 -0600 |
---|---|---|
committer | Slávek Banko <[email protected]> | 2012-07-30 23:30:15 +0200 |
commit | 663f2b31dd521c5a68503d61dfb618fc54ca3078 (patch) | |
tree | f595ca518520e2e2eb8cf8e73f373c4d9d8d382b /knetworkmanager-0.8/src | |
parent | 4c7c7b15be1d6c77d350bc9c972f68a91af1a34f (diff) | |
download | knetworkmanager8-663f2b31dd521c5a68503d61dfb618fc54ca3078.tar.gz knetworkmanager8-663f2b31dd521c5a68503d61dfb618fc54ca3078.zip |
Remove additional unneeded tq method conversions
(cherry picked from commit aa76ad73287dfdb114ee6959bc633eafdb7470b7)
Diffstat (limited to 'knetworkmanager-0.8/src')
14 files changed, 44 insertions, 44 deletions
diff --git a/knetworkmanager-0.8/src/devicetraycomponent.cpp b/knetworkmanager-0.8/src/devicetraycomponent.cpp index 9b63cc4..d42db60 100644 --- a/knetworkmanager-0.8/src/devicetraycomponent.cpp +++ b/knetworkmanager-0.8/src/devicetraycomponent.cpp @@ -70,8 +70,8 @@ TQStringList DeviceTrayComponent::getToolTipText() TQStringList list; NMDeviceState state = m_device->getState(); if (m_tooltips.contains(state)) { - list.append(i18n("Device: %1").tqarg(m_device->getInterface())); - list.append(i18n("State: %1").tqarg(m_tooltips[state])); + list.append(i18n("Device: %1").arg(m_device->getInterface())); + list.append(i18n("State: %1").arg(m_tooltips[state])); } return list; } diff --git a/knetworkmanager-0.8/src/knetworkmanager-cellular_device_tray.cpp b/knetworkmanager-0.8/src/knetworkmanager-cellular_device_tray.cpp index 8dab95a..ea88749 100644 --- a/knetworkmanager-0.8/src/knetworkmanager-cellular_device_tray.cpp +++ b/knetworkmanager-0.8/src/knetworkmanager-cellular_device_tray.cpp @@ -124,7 +124,7 @@ void CellularDeviceTray::addMenuItems(KPopupMenu* menu) { TQString title = info->getName(); if (ip) - title += TQString(" (%1)").tqarg(ip->getMethod() == IPv4::METHOD_DHCP ? i18n("DHCP") : i18n("Manual IP config")); + title += TQString(" (%1)").arg(ip->getMethod() == IPv4::METHOD_DHCP ? i18n("DHCP") : i18n("Manual IP config")); NetworkMenuItem* item = new NetworkMenuItem(d->dev, cellularconn, TQT_TQOBJECT(menu)); @@ -148,7 +148,7 @@ void CellularDeviceTray::addMenuItems(KPopupMenu* menu) { TQString title = info->getName(); if (ip) - title += TQString(" (%1)").tqarg(ip->getMethod() == IPv4::METHOD_DHCP ? i18n("DHCP") : i18n("Manual IP config")); + title += TQString(" (%1)").arg(ip->getMethod() == IPv4::METHOD_DHCP ? i18n("DHCP") : i18n("Manual IP config")); NetworkMenuItem* item = new NetworkMenuItem(d->dev, cellularconn, TQT_TQOBJECT(menu)); 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 3cf6a9f..b2275ce 100644 --- a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless_widget.cpp +++ b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless_widget.cpp @@ -51,7 +51,7 @@ class NetworkListViewItem : public KListViewItem public: NetworkListViewItem(TQListView* parent, WirelessNetwork& net) - : KListViewItem(parent, TQString::fromUtf8(net.getDisplaySsid()), TQString("%1\%").tqarg(net.getStrength())) + : KListViewItem(parent, TQString::fromUtf8(net.getDisplaySsid()), TQString("%1\%").arg(net.getStrength())) , _net(net) { TQ_UINT8 strength = net.getStrength(); diff --git a/knetworkmanager-0.8/src/knetworkmanager-device_tray.cpp b/knetworkmanager-0.8/src/knetworkmanager-device_tray.cpp index e8d80b5..e0c05a9 100644 --- a/knetworkmanager-0.8/src/knetworkmanager-device_tray.cpp +++ b/knetworkmanager-0.8/src/knetworkmanager-device_tray.cpp @@ -102,7 +102,7 @@ TQString DeviceTray::getTooltipText() TQString tooltip = TQString(); if (!d->tooltips[state].isEmpty()) - tooltip += i18n("State: %1").tqarg(d->tooltips[state]); + tooltip += i18n("State: %1").arg(d->tooltips[state]); return tooltip; } diff --git a/knetworkmanager-0.8/src/knetworkmanager-pluginmanager.cpp b/knetworkmanager-0.8/src/knetworkmanager-pluginmanager.cpp index b09f72d..7654ccd 100644 --- a/knetworkmanager-0.8/src/knetworkmanager-pluginmanager.cpp +++ b/knetworkmanager-0.8/src/knetworkmanager-pluginmanager.cpp @@ -46,7 +46,7 @@ PluginManager::PluginManager(TQObject* parent, const char* name) // a bit debug output for(TQValueList<KPluginInfo*>::ConstIterator it = _plugins.begin(); it != _plugins.end(); ++it) - kdDebug() << k_funcinfo << TQString("Found Plugin '%1'").tqarg((*it)->pluginName()) << endl; + kdDebug() << k_funcinfo << TQString("Found Plugin '%1'").arg((*it)->pluginName()) << endl; } PluginManager::~PluginManager() @@ -126,12 +126,12 @@ Plugin* PluginManager::loadPlugin(const TQString& pluginID) int error = 0; KPluginInfo* info = infoForPluginID(pluginID); Plugin *plugin = KParts::ComponentFactory::createInstanceFromQuery<Plugin>( TQString::fromLatin1( "KNetworkManager/Plugin" ), - TQString::fromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).tqarg( pluginID ), this, 0, TQStringList(), &error ); + TQString::fromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).arg( pluginID ), this, 0, TQStringList(), &error ); // plugin loaded? if (plugin) { - kdDebug() << k_funcinfo << TQString(i18n("successfully loaded plugin '%1'")).tqarg(info->pluginName()) << endl; + kdDebug() << k_funcinfo << TQString(i18n("successfully loaded plugin '%1'")).arg(info->pluginName()) << endl; _loadedPlugins.insert(info, plugin); } else diff --git a/knetworkmanager-0.8/src/knetworkmanager-storage.cpp b/knetworkmanager-0.8/src/knetworkmanager-storage.cpp index 553bd1f..b4ce93b 100644 --- a/knetworkmanager-0.8/src/knetworkmanager-storage.cpp +++ b/knetworkmanager-0.8/src/knetworkmanager-storage.cpp @@ -364,7 +364,7 @@ Storage::saveConnection(Connection* conn) return false; // let's get the config group for this connection - KConfigGroup grp(config, TQString("Connection_%1").tqarg(id)); + KConfigGroup grp(config, TQString("Connection_%1").arg(id)); TQStringList settings_grps; TQStringList secrets_grps; @@ -427,7 +427,7 @@ Storage::saveConnectionSetting(Connection* conn, ConnectionSetting* setting, TQS return false; // get a group for this setting - setting_grp = TQString("ConnectionSetting_%1_%2").tqarg(id).tqarg(type); + setting_grp = TQString("ConnectionSetting_%1_%2").arg(id).arg(type); KConfigGroup grp(config, setting_grp); // write the type @@ -437,8 +437,8 @@ Storage::saveConnectionSetting(Connection* conn, ConnectionSetting* setting, TQS SettingsMap map = setting->toMap(); for (SettingsMap::ConstIterator it = map.begin(); it != map.end(); ++it) { - kdDebug() << k_funcinfo << " " << TQString("Value_%1").tqarg(it.key()) << " = " << XMLMarshaller::fromTQT_DBusData( it.data() )<< endl; - grp.writeEntry(TQString("Value_%1").tqarg(it.key()), XMLMarshaller::fromTQT_DBusData( it.data() )); + kdDebug() << k_funcinfo << " " << TQString("Value_%1").arg(it.key()) << " = " << XMLMarshaller::fromTQT_DBusData( it.data() )<< endl; + grp.writeEntry(TQString("Value_%1").arg(it.key()), XMLMarshaller::fromTQT_DBusData( it.data() )); } return true; } @@ -474,7 +474,7 @@ Storage::saveConnectionSecrets(Connection* conn, ConnectionSetting* setting, TQS printf("Secrets storage requested: %d\n\r", storage_requested); // get a group for this setting - setting_grp = TQString("ConnectionSecrets_%1_%2").tqarg(id).tqarg(type); + setting_grp = TQString("ConnectionSecrets_%1_%2").arg(id).arg(type); KConfigGroup grp(config, setting_grp); // write the type @@ -484,12 +484,12 @@ Storage::saveConnectionSecrets(Connection* conn, ConnectionSetting* setting, TQS SettingsMap map = setting->toSecretsMap(false); for (SettingsMap::ConstIterator it = map.begin(); it != map.end(); ++it) { - kdDebug() << k_funcinfo << " " << TQString("Value_%1").tqarg(it.key()) << " = " << XMLMarshaller::fromTQT_DBusData( it.data() )<< endl; + kdDebug() << k_funcinfo << " " << TQString("Value_%1").arg(it.key()) << " = " << XMLMarshaller::fromTQT_DBusData( it.data() )<< endl; if (storage_requested == true) { - grp.writeEntry(TQString("Value_%1").tqarg(it.key()), XMLMarshaller::fromTQT_DBusData( it.data() )); + grp.writeEntry(TQString("Value_%1").arg(it.key()), XMLMarshaller::fromTQT_DBusData( it.data() )); } else { - grp.writeEntry(TQString("Value_%1").tqarg(it.key()), TQString("") ); + grp.writeEntry(TQString("Value_%1").arg(it.key()), TQString("") ); } } return true; @@ -527,7 +527,7 @@ Storage::hasSecretsStored(Connection* connection, ConnectionSetting* setting) return false; // get a group for this setting - TQString setting_grp_name = TQString("ConnectionSecrets_%1_%2").tqarg(id).tqarg(type); + TQString setting_grp_name = TQString("ConnectionSecrets_%1_%2").arg(id).arg(type); TQMap<TQString, TQString> config_map = KGlobal::config()->entryMap(setting_grp_name); @@ -565,7 +565,7 @@ Storage::restoreSecrets(Connection* connection, ConnectionSetting* setting) return false; // get a group for this setting - TQString setting_grp = TQString("ConnectionSecrets_%1_%2").tqarg(id).tqarg(type); + TQString setting_grp = TQString("ConnectionSecrets_%1_%2").arg(id).arg(type); // restore the setting return restoreSecrets(connection, setting_grp); @@ -584,7 +584,7 @@ Storage::restoreVPNSecrets(Connection* connection, ConnectionSetting* setting) return false; // get a group for this setting - TQString setting_grp = TQString("ConnectionSecrets_%1_%2").tqarg(id).tqarg(type); + TQString setting_grp = TQString("ConnectionSecrets_%1_%2").arg(id).arg(type); // restore the setting return restoreVPNSecrets(connection, setting_grp); @@ -605,7 +605,7 @@ Storage::deleteConnection(Connection* conn) return false; // let's get the config group for this connection - KConfigGroup grp(config, TQString("Connection_%1").tqarg(id)); + KConfigGroup grp(config, TQString("Connection_%1").arg(id)); // delete all associated settings diff --git a/knetworkmanager-0.8/src/knetworkmanager-tray.cpp b/knetworkmanager-0.8/src/knetworkmanager-tray.cpp index 43ec333..62851ff 100644 --- a/knetworkmanager-0.8/src/knetworkmanager-tray.cpp +++ b/knetworkmanager-0.8/src/knetworkmanager-tray.cpp @@ -139,7 +139,7 @@ void NewSecretsDialog::init() // show a message to the user that the connection failed // and allow edit or cancel - TQLabel* label = new TQLabel(tqtr(" The connection %1 could not be established ").tqarg(conn->getInfoSetting()->getName()), this); + TQLabel* label = new TQLabel(tqtr(" The connection %1 could not be established ").arg(conn->getInfoSetting()->getName()), this); TQPushButton* buttonEdit = new TQPushButton(tr("&Edit"), this); TQPushButton* buttonCancel = new TQPushButton(tr("&Cancel"), this); @@ -277,8 +277,8 @@ void Tray::contextMenuAboutToShow (KPopupMenu* menu) KAction * deviceNewConnAction = 0; if (dev_comp) { - TQString actionName = TQString("new_connection_%1").tqarg(dev_comp->device()->getInterface()); - TQString menuCaption = TQString("%1").tqarg(dev_comp->device()->getInterface()); + TQString actionName = TQString("new_connection_%1").arg(dev_comp->device()->getInterface()); + TQString menuCaption = TQString("%1").arg(dev_comp->device()->getInterface()); if (menuCaption.contains("eth", FALSE) > 0) { menuCaption = menuCaption.insert(0, "Wired Connection ("); } @@ -303,7 +303,7 @@ void Tray::contextMenuAboutToShow (KPopupMenu* menu) ++it; KAction * deviceNewConnAction = 0; TQString menuCaption = "VPN Connection"; - TQString actionName = TQString("new_connection_%1").tqarg("vpn"); + TQString actionName = TQString("new_connection_%1").arg("vpn"); deviceNewConnAction = new KAction (menuCaption, 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewVPNConnection()), actionCollection(), actionName); newConnActionMenu->insert(deviceNewConnAction); } else if ( devices == 1 ) { @@ -331,11 +331,11 @@ void Tray::contextMenuAboutToShow (KPopupMenu* menu) if (!conn) continue; - TQString actionName = TQString("disable_connection_%1_%2").tqarg(conn->getID()).tqarg(dev ? dev->getInterface() : ""); + TQString actionName = TQString("disable_connection_%1_%2").arg(conn->getID()).arg(dev ? dev->getInterface() : ""); KAction * deviceNewConnAction = actionCollection ()->action (actionName); TQString actionText = conn->getInfoSetting()->getName(); if (dev) - actionText += TQString(" (%1)").tqarg(dev->getInterface()); + actionText += TQString(" (%1)").arg(dev->getInterface()); if (!deviceNewConnAction) { deviceNewConnAction = new KAction (actionText, 0, &d->signalMapper, TQT_SLOT(map()), actionCollection(), actionName); @@ -470,7 +470,7 @@ Tray::slotVPNSecretsNeeded(ConnectionSettings::Connection* connection, Connectio } else { // Get a group for this setting - TQString setting_grp = TQString("ConnectionSecrets_%1_%2").tqarg(id).tqarg(type); + TQString setting_grp = TQString("ConnectionSecrets_%1_%2").arg(id).arg(type); // Restore the settings printf("Restoring VPN secret: %s\n\r", setting_grp.ascii()); @@ -629,7 +629,7 @@ void Tray::slotRemoveDeviceTrayComponent(Device* dev) } // remove the appropriate action - TQString actionName = TQString("new_connection_%1").tqarg(dev_comp->device()->getInterface()); + TQString actionName = TQString("new_connection_%1").arg(dev_comp->device()->getInterface()); KAction * deviceNewConnAction = actionCollection ()->action (actionName); if (!deviceNewConnAction) @@ -999,13 +999,13 @@ void Tray::updateActiveConnection(NMDeviceState state) void Tray::slotDeviceAddedNotify(Device* dev) { kdDebug() << "Tray::slotDeviceAddedNotify" << endl; - KNotifyClient::event( winId(), "knm-nm-device-added", i18n("New network device %1 found").tqarg(dev->getInterface()) ); + KNotifyClient::event( winId(), "knm-nm-device-added", i18n("New network device %1 found").arg(dev->getInterface()) ); } void Tray::slotDeviceRemovedNotify(Device* dev) { kdDebug() << "Tray::slotDeviceRemovedNotify" << endl; - KNotifyClient::event( winId(), "knm-nm-device-removed", i18n("Network device %1 removed").tqarg(dev->getInterface()) ); + KNotifyClient::event( winId(), "knm-nm-device-removed", i18n("Network device %1 removed").arg(dev->getInterface()) ); } void Tray::slotVPNBannerShow(const TQString& vpnbanner) diff --git a/knetworkmanager-0.8/src/knetworkmanager-vpnauthenticationdialog.cpp b/knetworkmanager-0.8/src/knetworkmanager-vpnauthenticationdialog.cpp index 6f334d4..ffeb933 100644 --- a/knetworkmanager-0.8/src/knetworkmanager-vpnauthenticationdialog.cpp +++ b/knetworkmanager-0.8/src/knetworkmanager-vpnauthenticationdialog.cpp @@ -63,7 +63,7 @@ VPNAuthenticationDialog::VPNAuthenticationDialog(VPNConnection* conn, TQWidget* , _conn(conn) { this->setIcon(SmallIcon("encrypted", TQIconSet::Automatic)); - this->setCaption(i18n("VPN Authentication for %1").tqarg(conn->getInfoSetting()->getName())); + this->setCaption(i18n("VPN Authentication for %1").arg(conn->getInfoSetting()->getName())); labelPixmap->setPixmap(KGlobal::instance()->iconLoader()->loadIcon("encrypted", KIcon::Small, 32)); // nice icons diff --git a/knetworkmanager-0.8/src/knetworkmanager-vpnservice.cpp b/knetworkmanager-0.8/src/knetworkmanager-vpnservice.cpp index b81a3db..84daa0c 100644 --- a/knetworkmanager-0.8/src/knetworkmanager-vpnservice.cpp +++ b/knetworkmanager-0.8/src/knetworkmanager-vpnservice.cpp @@ -63,7 +63,7 @@ VPNService::VPNService(const TQString& serviceName, const TQString& service, TQO VPNPlugin* vpnPlugin = dynamic_cast<VPNPlugin*>( plugMan->getPlugin(list.first()) ); if (vpnPlugin) { - kdDebug() << k_funcinfo << i18n("Using VPN plugin '%1' for service '%2'").tqarg(list.first()).tqarg(serviceName) << endl; + kdDebug() << k_funcinfo << i18n("Using VPN plugin '%1' for service '%2'").arg(list.first()).arg(serviceName) << endl; _vpnPlugin = vpnPlugin; } } diff --git a/knetworkmanager-0.8/src/knetworkmanager-wired_device_tray.cpp b/knetworkmanager-0.8/src/knetworkmanager-wired_device_tray.cpp index 328b01d..7e96886 100644 --- a/knetworkmanager-0.8/src/knetworkmanager-wired_device_tray.cpp +++ b/knetworkmanager-0.8/src/knetworkmanager-wired_device_tray.cpp @@ -85,7 +85,7 @@ void WiredDeviceTray::addMenuItems(KPopupMenu* menu) ConnectionStore* connectionStore = ConnectionStore::getInstance(); // device title - Subhead* subhead = new Subhead (menu, "subhead", TQString("Wired Connection (%1)").tqarg(d->dev->getInterface()), SmallIcon("wired", TQIconSet::Automatic)); + Subhead* subhead = new Subhead (menu, "subhead", TQString("Wired Connection (%1)").arg(d->dev->getInterface()), SmallIcon("wired", TQIconSet::Automatic)); menu->insertItem (subhead, -1, -1); // bolding subhead instead @@ -121,7 +121,7 @@ void WiredDeviceTray::addMenuItems(KPopupMenu* menu) { TQString title = info->getName(); if (ip) - title += TQString(" (%1)").tqarg(ip->getMethod() == IPv4::METHOD_DHCP ? i18n("DHCP") : i18n("Manual IP config")); + title += TQString(" (%1)").arg(ip->getMethod() == IPv4::METHOD_DHCP ? i18n("DHCP") : i18n("Manual IP config")); NetworkMenuItem* item = new NetworkMenuItem(d->dev, wiredconn, TQT_TQOBJECT(menu)); connectionItems += 1; diff --git a/knetworkmanager-0.8/src/knetworkmanager-wireless_device_tray.cpp b/knetworkmanager-0.8/src/knetworkmanager-wireless_device_tray.cpp index 9bf44ed..443fdec 100644 --- a/knetworkmanager-0.8/src/knetworkmanager-wireless_device_tray.cpp +++ b/knetworkmanager-0.8/src/knetworkmanager-wireless_device_tray.cpp @@ -83,7 +83,7 @@ TQStringList WirelessDeviceTray::getToolTipText() AccessPoint * ap = d->dev->getActiveAccessPoint(); if (ap) - tooltip.append(i18n("Network: %1").tqarg(ap->getDisplaySsid())); + tooltip.append(i18n("Network: %1").arg(ap->getDisplaySsid())); return tooltip; } @@ -250,7 +250,7 @@ void WirelessDeviceTray::addMenuItems(KPopupMenu* menu) TQT_DBusError err; // device title - Subhead* subhead = new Subhead (menu, "subhead", TQString("Wireless Connection (%1)").tqarg(d->dev->getInterface()), SmallIcon("wireless", TQIconSet::Automatic)); + Subhead* subhead = new Subhead (menu, "subhead", TQString("Wireless Connection (%1)").arg(d->dev->getInterface()), SmallIcon("wireless", TQIconSet::Automatic)); menu->insertItem (subhead, -1, -1); // bolding subhead instead diff --git a/knetworkmanager-0.8/src/knetworkmanager-wireless_menuitem.cpp b/knetworkmanager-0.8/src/knetworkmanager-wireless_menuitem.cpp index e9157f3..6426474 100644 --- a/knetworkmanager-0.8/src/knetworkmanager-wireless_menuitem.cpp +++ b/knetworkmanager-0.8/src/knetworkmanager-wireless_menuitem.cpp @@ -94,20 +94,20 @@ TQString WirelessNetworkItem::getDisplayText() { TQString security = ""; if (_net.getWpaFlags() != NM_802_11_AP_SEC_NONE && _net.getRsnFlags() != NM_802_11_AP_SEC_NONE) - security = TQString("(%1/%2)").tqarg(i18n("WPA")).tqarg(i18n("RSN")); + security = TQString("(%1/%2)").arg(i18n("WPA")).arg(i18n("RSN")); else if (_net.getWpaFlags() != NM_802_11_AP_SEC_NONE) - security = TQString("(%1)").tqarg(i18n("WPA")); + security = TQString("(%1)").arg(i18n("WPA")); else if (_net.getRsnFlags() != NM_802_11_AP_SEC_NONE) - security = TQString("(%2)").tqarg(i18n("RSN")); + security = TQString("(%2)").arg(i18n("RSN")); Info* info = NULL; if (_conn) info = _conn->getInfoSetting(); if (info && info->getName() != _net.getDisplaySsid()) - return TQString("%2/%1 %3").tqarg(TQString::fromUtf8(_net.getDisplaySsid())).tqarg(info->getName()).tqarg(security); + return TQString("%2/%1 %3").arg(TQString::fromUtf8(_net.getDisplaySsid())).arg(info->getName()).arg(security); else - return TQString("%1 %2").tqarg(TQString::fromUtf8(_net.getDisplaySsid())).tqarg(security); + return TQString("%1 %2").arg(TQString::fromUtf8(_net.getDisplaySsid())).arg(security); } void diff --git a/knetworkmanager-0.8/src/sha1.cpp b/knetworkmanager-0.8/src/sha1.cpp index 8525ed2..74f4df9 100644 --- a/knetworkmanager-0.8/src/sha1.cpp +++ b/knetworkmanager-0.8/src/sha1.cpp @@ -328,7 +328,7 @@ Minor changes to match the coding style used in Dynamics. Modified September 24, 2004 By Jouni Malinen <[email protected]> -Fixed tqalignment issue in SHA1Transform when SHA1HANDSOFF is defined. +Fixed alignment issue in SHA1Transform when SHA1HANDSOFF is defined. */ diff --git a/knetworkmanager-0.8/src/vpnauthentication.ui b/knetworkmanager-0.8/src/vpnauthentication.ui index b62216a..124fa55 100644 --- a/knetworkmanager-0.8/src/vpnauthentication.ui +++ b/knetworkmanager-0.8/src/vpnauthentication.ui @@ -78,7 +78,7 @@ <property name="scaledContents"> <bool>false</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> </widget> |